Mercurial > public > mercurial-scm > hg
comparison mercurial/util.py @ 34467:192f7b126ed2
urllibcompat: move some adapters from pycompat to urllibcompat
These are all the httpserver and urllib.* aliases. They seem to make
more sense in the slightly-more-specific urllibcompat package than the
general-purpose pycompat.
Differential Revision: https://phab.mercurial-scm.org/D935
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 04 Oct 2017 11:58:00 -0400 |
parents | 5326e4ef1dab |
children | 6f11a74d489f |
comparison
equal
deleted
inserted
replaced
34466:1232f7fa00c3 | 34467:192f7b126ed2 |
---|---|
48 encoding, | 48 encoding, |
49 error, | 49 error, |
50 i18n, | 50 i18n, |
51 policy, | 51 policy, |
52 pycompat, | 52 pycompat, |
53 urllibcompat, | |
53 ) | 54 ) |
54 | 55 |
55 base85 = policy.importmod(r'base85') | 56 base85 = policy.importmod(r'base85') |
56 osutil = policy.importmod(r'osutil') | 57 osutil = policy.importmod(r'osutil') |
57 parsers = policy.importmod(r'parsers') | 58 parsers = policy.importmod(r'parsers') |
60 b85encode = base85.b85encode | 61 b85encode = base85.b85encode |
61 | 62 |
62 cookielib = pycompat.cookielib | 63 cookielib = pycompat.cookielib |
63 empty = pycompat.empty | 64 empty = pycompat.empty |
64 httplib = pycompat.httplib | 65 httplib = pycompat.httplib |
65 httpserver = pycompat.httpserver | |
66 pickle = pycompat.pickle | 66 pickle = pycompat.pickle |
67 queue = pycompat.queue | 67 queue = pycompat.queue |
68 socketserver = pycompat.socketserver | 68 socketserver = pycompat.socketserver |
69 stderr = pycompat.stderr | 69 stderr = pycompat.stderr |
70 stdin = pycompat.stdin | 70 stdin = pycompat.stdin |
71 stdout = pycompat.stdout | 71 stdout = pycompat.stdout |
72 stringio = pycompat.stringio | 72 stringio = pycompat.stringio |
73 urlerr = pycompat.urlerr | |
74 urlreq = pycompat.urlreq | |
75 xmlrpclib = pycompat.xmlrpclib | 73 xmlrpclib = pycompat.xmlrpclib |
74 | |
75 httpserver = urllibcompat.httpserver | |
76 urlerr = urllibcompat.urlerr | |
77 urlreq = urllibcompat.urlreq | |
76 | 78 |
77 # workaround for win32mbcs | 79 # workaround for win32mbcs |
78 _filenamebytestr = pycompat.bytestr | 80 _filenamebytestr = pycompat.bytestr |
79 | 81 |
80 def isatty(fp): | 82 def isatty(fp): |