##// END OF EJS Templates
thirdparty: move selectors2 module to where it should be
Yuya Nishihara -
r35245:414114a7 default
parent child Browse files
Show More
@@ -31,9 +31,6 b' if sys.version_info[0] >= 3:'
31 # Only handle Mercurial-related modules.
31 # Only handle Mercurial-related modules.
32 if not fullname.startswith(('mercurial.', 'hgext.', 'hgext3rd.')):
32 if not fullname.startswith(('mercurial.', 'hgext.', 'hgext3rd.')):
33 return None
33 return None
34 # selectors2 is already dual-version clean, don't try and mangle it
35 if fullname.startswith('mercurial.selectors2'):
36 return None
37 # third-party packages are expected to be dual-version clean
34 # third-party packages are expected to be dual-version clean
38 if fullname.startswith('mercurial.thirdparty'):
35 if fullname.startswith('mercurial.thirdparty'):
39 return None
36 return None
@@ -17,11 +17,11 b' import struct'
17 import traceback
17 import traceback
18
18
19 from .i18n import _
19 from .i18n import _
20 from .thirdparty import selectors2
20 from . import (
21 from . import (
21 encoding,
22 encoding,
22 error,
23 error,
23 pycompat,
24 pycompat,
24 selectors2,
25 util,
25 util,
26 )
26 )
27
27
@@ -22,8 +22,6 b''
22 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23 # SOFTWARE.
23 # SOFTWARE.
24
24
25 # no-check-code
26
27 from __future__ import absolute_import
25 from __future__ import absolute_import
28
26
29 import collections
27 import collections
@@ -34,7 +32,7 b' import socket'
34 import sys
32 import sys
35 import time
33 import time
36
34
37 from . import pycompat
35 from .. import pycompat
38
36
39 namedtuple = collections.namedtuple
37 namedtuple = collections.namedtuple
40 Mapping = collections.Mapping
38 Mapping = collections.Mapping
@@ -15,7 +15,6 b' New errors are not allowed. Warnings are'
15 Skipping i18n/polib.py it has no-che?k-code (glob)
15 Skipping i18n/polib.py it has no-che?k-code (glob)
16 Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
16 Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
17 Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
17 Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
18 Skipping mercurial/selectors2.py it has no-che?k-code (glob)
19 Skipping mercurial/statprof.py it has no-che?k-code (glob)
18 Skipping mercurial/statprof.py it has no-che?k-code (glob)
20 Skipping tests/badserverext.py it has no-che?k-code (glob)
19 Skipping tests/badserverext.py it has no-che?k-code (glob)
21
20
General Comments 0
You need to be logged in to leave comments. Login now