Mercurial > hg
changeset 27521:b1adf32b0605
httpconnection: use absolute_import
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Mon, 21 Dec 2015 21:52:58 -0800 |
parents | d8f132f047d6 |
children | 798535853345 |
files | mercurial/httpconnection.py tests/test-check-py3-compat.t |
diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/httpconnection.py Wed Dec 23 12:27:24 2015 -0800 +++ b/mercurial/httpconnection.py Mon Dec 21 21:52:58 2015 -0800 @@ -7,16 +7,21 @@ # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. + +from __future__ import absolute_import + import logging +import os import socket import urllib import urllib2 -import os -from mercurial import httpclient -from mercurial import sslutil -from mercurial import util -from mercurial.i18n import _ +from .i18n import _ +from . import ( + httpclient, + sslutil, + util, +) # moved here from url.py to avoid a cycle class httpsendfile(object):
--- a/tests/test-check-py3-compat.t Wed Dec 23 12:27:24 2015 -0800 +++ b/tests/test-check-py3-compat.t Mon Dec 21 21:52:58 2015 -0800 @@ -105,7 +105,6 @@ mercurial/httpclient/__init__.py not using absolute_import mercurial/httpclient/_readers.py not using absolute_import mercurial/httpclient/socketutil.py not using absolute_import - mercurial/httpconnection.py not using absolute_import mercurial/keepalive.py requires print_function mercurial/localrepo.py not using absolute_import mercurial/lsprof.py requires print_function