duplicity-team team mailing list archive

[Aaron Whitehouse <lists@xxxxxxxxxxxxxxxxxx>]

Aaron Whitehouse has proposed merging lp:~aaron-whitehouse/duplicity/pep8_E402_fixes into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~aaron-whitehouse/duplicity/pep8_E402_fixes/+merge/318849

Fixed PEP8 errors: E402 module level import not at top of file
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~aaron-whitehouse/duplicity/pep8_E402_fixes into lp:duplicity.

=== modified file 'bin/duplicity'
--- bin/duplicity	2017-02-27 13:18:57 +0000
+++ bin/duplicity	2017-03-02 22:40:34 +0000
@@ -27,18 +27,38 @@
 # Please send mail to me or the mailing list if you find bugs or have
 # any suggestions.
 
+import duplicity.errors
 import gzip
 import os
+import platform
+import re
+import resource
+import statvfs
 import sys
+import threading
 import time
+import traceback
 import types
-import traceback
-import platform
-import statvfs
-import resource
-import re
-import threading
+
 from datetime import datetime
+from duplicity import asyncscheduler
+from duplicity import collections
+from duplicity import commandline
+from duplicity import diffdir
+from duplicity import dup_temp
+from duplicity import dup_time
+from duplicity import file_naming
+from duplicity import globals
+from duplicity import gpg
+from duplicity import log
+from duplicity import manifest
+from duplicity import patchdir
+from duplicity import path
+from duplicity import progress
+from duplicity import robust
+from duplicity import tempdir
+from duplicity import util
+
 try:
     from lockfile import FileLock
 except:
@@ -63,28 +83,8 @@
     sys.path.insert(0, base)
 # end remote debugger startup
 
-from duplicity import log
 log.setup()
 
-import duplicity.errors
-
-from duplicity import collections
-from duplicity import commandline
-from duplicity import diffdir
-from duplicity import dup_temp
-from duplicity import dup_time
-from duplicity import file_naming
-from duplicity import globals
-from duplicity import gpg
-from duplicity import manifest
-from duplicity import patchdir
-from duplicity import path
-from duplicity import robust
-from duplicity import tempdir
-from duplicity import asyncscheduler
-from duplicity import util
-from duplicity import progress
-
 # If exit_val is not None, exit with given value at end.
 exit_val = None
 

=== modified file 'duplicity/dup_threading.py'
--- duplicity/dup_threading.py	2015-01-31 23:30:49 +0000
+++ duplicity/dup_threading.py	2017-03-02 22:40:34 +0000
@@ -28,6 +28,10 @@
 at least python 2.5.)
 """
 
+import sys
+from duplicity import errors
+
+
 _threading_supported = True
 
 try:
@@ -42,10 +46,6 @@
     import dummy_threading as threading
     _threading_supported = False
 
-import sys
-
-from duplicity import errors
-
 
 def threading_supported():
     """

=== modified file 'duplicity/lazy.py'
--- duplicity/lazy.py	2017-01-19 00:32:12 +0000
+++ duplicity/lazy.py	2017-03-02 22:40:34 +0000
@@ -23,6 +23,9 @@
 from __future__ import print_function
 
 import os
+from duplicity import log
+from duplicity import robust
+from duplicity import util
 
 
 class Iter:
@@ -420,8 +423,3 @@
         log.Warn(_("Skipping %s because of previous error") % util.ufn(index_str),
                  log.WarningCode.process_skipped,
                  util.escape(index_str))
-
-
-from duplicity import log
-from duplicity import robust
-from duplicity import util

=== modified file 'duplicity/librsync.py'
--- duplicity/librsync.py	2016-08-29 14:44:56 +0000
+++ duplicity/librsync.py	2017-03-02 22:40:34 +0000
@@ -26,13 +26,14 @@
 
 """
 import os
+from . import _librsync
+import types
+import array
+
 if os.environ.get('READTHEDOCS') == 'True':
     import mock
     import duplicity
     duplicity._librsync = mock.MagicMock()
-from . import _librsync
-import types
-import array
 
 blocksize = _librsync.RS_JOB_BLOCKSIZE
 

=== modified file 'duplicity/robust.py'
--- duplicity/robust.py	2017-02-20 00:05:17 +0000
+++ duplicity/robust.py	2017-03-02 22:40:34 +0000
@@ -20,6 +20,9 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 import errno
+from duplicity import librsync
+from duplicity import log
+from duplicity import util
 
 tmp_file_index = 1
 
@@ -63,8 +66,3 @@
     dir_listing = check_common_error(error_handler, path.listdir)
     dir_listing.sort()
     return dir_listing
-
-
-from duplicity import librsync
-from duplicity import log
-from duplicity import util

=== modified file 'duplicity/tarfile.py'
--- duplicity/tarfile.py	2014-04-16 20:45:09 +0000
+++ duplicity/tarfile.py	2017-03-02 22:40:34 +0000
@@ -23,6 +23,7 @@
 from __future__ import absolute_import
 
 import tarfile
+from duplicity import cached_ops
 
 # Grab all symbols in tarfile, to try to reproduce its API exactly.
 # from <> import * wouldn't get everything we want, since tarfile defines
@@ -31,5 +32,4 @@
     globals()[sym] = getattr(tarfile, sym)
 
 # Now make sure that we cache the grp/pwd ops
-from duplicity import cached_ops
 grp = pwd = cached_ops

=== modified file 'tox.ini'
--- tox.ini	2017-02-20 00:05:17 +0000
+++ tox.ini	2017-03-02 22:40:34 +0000
@@ -22,8 +22,7 @@
     {envpython} {toxinidir}/setup.py test {posargs}
 
 [pycodestyle]
-ignore=E402,E722,E731,E741
-# E402 module level import not at top of file
+ignore=E722,E731,E741
 # E722 do not use bare except
 # E731 do not assign a lambda expression, use a def
 # E741 ambiguous variable name