[PATCH 2 of 4] lfs: quiesce check-module-import warnings
Matt Harbison
mharbison72 at gmail.com
Tue Nov 14 22:17:58 EST 2017
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1510636492 18000
# Tue Nov 14 00:14:52 2017 -0500
# Node ID fce924e1066b338944c4a4913b236cd39a1c4a40
# Parent 450fbe4afec3a3f800b3e13ea787288445aa8f7c
lfs: quiesce check-module-import warnings
Specifically, 'symbol import follows non-symbol import: mercurial.i18n'
diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py
--- a/hgext/lfs/__init__.py
+++ b/hgext/lfs/__init__.py
@@ -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,
diff --git a/hgext/lfs/blobstore.py b/hgext/lfs/blobstore.py
--- a/hgext/lfs/blobstore.py
+++ b/hgext/lfs/blobstore.py
@@ -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')
diff --git a/hgext/lfs/pointer.py b/hgext/lfs/pointer.py
--- a/hgext/lfs/pointer.py
+++ b/hgext/lfs/pointer.py
@@ -9,10 +9,11 @@
import re
+from mercurial.i18n import _
+
from mercurial import (
error,
)
-from mercurial.i18n import _
class InvalidPointer(error.RevlogError):
pass
diff --git a/hgext/lfs/wrapper.py b/hgext/lfs/wrapper.py
--- a/hgext/lfs/wrapper.py
+++ b/hgext/lfs/wrapper.py
@@ -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,
More information about the Mercurial-devel
mailing list