[Python-checkins] cpython: unused imports, pep8

[philip.jenvey]

http://hg.python.org/cpython/rev/8840037a9c53
changeset:   75250:8840037a9c53
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Fri Feb 24 21:48:17 2012 -0800
summary:
  unused imports, pep8

files:
  Lib/importlib/_bootstrap.py |  14 ++++++++------
  Lib/importlib/abc.py        |  10 ++++------
  2 files changed, 12 insertions(+), 12 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -69,7 +69,7 @@
 def _path_join(*args):
     """Replacement for os.path.join."""
     return path_sep.join(x[:-len(path_sep)] if x.endswith(path_sep) else x
-                            for x in args if x)
+                         for x in args if x)
 
 
 def _path_exists(path):
@@ -406,14 +406,16 @@
                 pass
             else:
                 if _r_long(raw_timestamp) != source_mtime:
-                    raise ImportError("bytecode is stale for {}".format(fullname))
+                    raise ImportError(
+                        "bytecode is stale for {}".format(fullname))
             try:
                 source_size = source_stats['size'] & 0xFFFFFFFF
             except KeyError:
                 pass
             else:
                 if _r_long(raw_size) != source_size:
-                    raise ImportError("bytecode is stale for {}".format(fullname))
+                    raise ImportError(
+                        "bytecode is stale for {}".format(fullname))
         # Can't return the code object as errors from marshal loading need to
         # propagate even when source is available.
         return data[12:]
@@ -519,7 +521,7 @@
         code_object = compile(source_bytes, source_path, 'exec',
                                 dont_inherit=True)
         if (not sys.dont_write_bytecode and bytecode_path is not None and
-                source_mtime is not None):
+            source_mtime is not None):
             # If e.g. Jython ever implements imp.cache_from_source to have
             # their own cached file format, this block of code will most likely
             # throw an exception.
@@ -890,7 +892,7 @@
 
 def _resolve_name(name, package, level):
     """Resolve a relative module name to an absolute one."""
-    bits = package.rsplit('.', level-1)
+    bits = package.rsplit('.', level - 1)
     if len(bits) < level:
         raise ValueError('attempted relative import beyond top-level package')
     base = bits[0]
@@ -1010,7 +1012,7 @@
             fromlist = list(fromlist)
             fromlist.remove('*')
             fromlist.extend(module.__all__)
-        for x in (y for y in fromlist if not hasattr(module,y)):
+        for x in (y for y in fromlist if not hasattr(module, y)):
             try:
                 import_('{0}.{1}'.format(module.__name__, x))
             except ImportError:
diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py
--- a/Lib/importlib/abc.py
+++ b/Lib/importlib/abc.py
@@ -1,15 +1,11 @@
 """Abstract base classes related to import."""
 from . import _bootstrap
 from . import machinery
-from . import util
 import abc
 import imp
-import io
 import marshal
-import os.path
 import sys
 import tokenize
-import types
 import warnings
 
 
@@ -256,7 +252,8 @@
             try:
                 magic = data[:4]
                 if len(magic) < 4:
-                    raise ImportError("bad magic number in {}".format(fullname))
+                    raise ImportError(
+                        "bad magic number in {}".format(fullname))
                 raw_timestamp = data[4:8]
                 if len(raw_timestamp) < 4:
                     raise EOFError("bad timestamp in {}".format(fullname))
@@ -264,7 +261,8 @@
                 bytecode = data[8:]
                 # Verify that the magic number is valid.
                 if imp.get_magic() != magic:
-                    raise ImportError("bad magic number in {}".format(fullname))
+                    raise ImportError(
+                        "bad magic number in {}".format(fullname))
                 # Verify that the bytecode is not stale (only matters when
                 # there is source to fall back on.
                 if source_timestamp:

-- 
Repository URL: http://hg.python.org/cpython