Mercurial > hg
changeset 35099:b8e5fb8d2389
lfs: quiesce check-module-import warnings
Specifically, 'symbol import follows non-symbol import: mercurial.i18n'
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 14 Nov 2017 00:14:52 -0500 |
| parents | 66c5a8cf2868 |
| children | 07e97998d385 |
| files | hgext/lfs/__init__.py hgext/lfs/blobstore.py hgext/lfs/pointer.py hgext/lfs/wrapper.py |
| diffstat | 4 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/lfs/__init__.py Tue Nov 14 00:06:23 2017 -0500 +++ b/hgext/lfs/__init__.py Tue Nov 14 00:14:52 2017 -0500 @@ -28,6 +28,8 @@ from __future__ import absolute_import +from mercurial.i18n import _ + from mercurial import ( bundle2, changegroup, @@ -40,7 +42,6 @@ scmutil, vfs as vfsmod, ) -from mercurial.i18n import _ from . import ( blobstore,
--- a/hgext/lfs/blobstore.py Tue Nov 14 00:06:23 2017 -0500 +++ b/hgext/lfs/blobstore.py Tue Nov 14 00:14:52 2017 -0500 @@ -11,13 +11,14 @@ import os import re +from mercurial.i18n import _ + from mercurial import ( error, url as urlmod, util, vfs as vfsmod, ) -from mercurial.i18n import _ # 64 bytes for SHA256 _lfsre = re.compile(r'\A[a-f0-9]{64}\Z')
--- a/hgext/lfs/pointer.py Tue Nov 14 00:06:23 2017 -0500 +++ b/hgext/lfs/pointer.py Tue Nov 14 00:14:52 2017 -0500 @@ -9,10 +9,11 @@ import re +from mercurial.i18n import _ + from mercurial import ( error, ) -from mercurial.i18n import _ class InvalidPointer(error.RevlogError): pass
--- a/hgext/lfs/wrapper.py Tue Nov 14 00:06:23 2017 -0500 +++ b/hgext/lfs/wrapper.py Tue Nov 14 00:14:52 2017 -0500 @@ -9,14 +9,15 @@ import hashlib +from mercurial.i18n import _ +from mercurial.node import bin, nullid, short + from mercurial import ( error, filelog, revlog, util, ) -from mercurial.i18n import _ -from mercurial.node import bin, nullid, short from . import ( blobstore,