diff options
| -rw-r--r-- | Lib/getpass.py | 4 | ||||
| -rw-r--r-- | Lib/pickle.py | 2 | ||||
| -rw-r--r-- | Lib/pstats.py | 1 | ||||
| -rw-r--r-- | Lib/shutil.py | 1 | ||||
| -rw-r--r-- | Lib/site.py | 3 | ||||
| -rw-r--r-- | Lib/tkinter/__init__.py | 5 | ||||
| -rw-r--r-- | Lib/tkinter/filedialog.py | 2 |
7 files changed, 6 insertions, 12 deletions
diff --git a/Lib/getpass.py b/Lib/getpass.py index dc02bd1..0044742 100644 --- a/Lib/getpass.py +++ b/Lib/getpass.py @@ -72,7 +72,7 @@ def unix_getpass(prompt='Password: ', stream=None): finally: termios.tcsetattr(fd, tcsetattr_flags, old) stream.flush() # issue7208 - except termios.error as e: + except termios.error: if passwd is not None: # _raw_input succeeded. The final tcsetattr failed. Reraise # instead of leaving the terminal in an unknown state. @@ -145,8 +145,6 @@ def getuser(): """ - import os - for name in ('LOGNAME', 'USER', 'LNAME', 'USERNAME'): user = os.environ.get(name) if user: diff --git a/Lib/pickle.py b/Lib/pickle.py index f6ff380..a911ca0 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -1326,7 +1326,7 @@ def _test(): return doctest.testmod() if __name__ == "__main__": - import sys, argparse + import argparse parser = argparse.ArgumentParser( description='display contents of the pickle files') parser.add_argument( diff --git a/Lib/pstats.py b/Lib/pstats.py index 3f0add2..334d717 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -674,7 +674,6 @@ if __name__ == '__main__': return stop return None - import sys if len(sys.argv) > 1: initprofile = sys.argv[1] else: diff --git a/Lib/shutil.py b/Lib/shutil.py index d6b8565..468ffcb 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -15,6 +15,7 @@ import tarfile try: import bz2 + del bz2 _BZ2_SUPPORTED = True except ImportError: _BZ2_SUPPORTED = False diff --git a/Lib/site.py b/Lib/site.py index 46fa53a..6ef1e0b 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -154,7 +154,7 @@ def addpackage(sitedir, name, known_paths): if not dircase in known_paths and os.path.exists(dir): sys.path.append(dir) known_paths.add(dircase) - except Exception as err: + except Exception: print("Error processing line {:d} of {}:\n".format(n+1, fullname), file=sys.stderr) for record in traceback.format_exception(*sys.exc_info()): @@ -241,7 +241,6 @@ def getusersitepackages(): return USER_SITE from sysconfig import get_path - import os if sys.platform == 'darwin': from sysconfig import get_config_var diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index e58cc35..f4f9583 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1159,7 +1159,6 @@ class Misc: return (e,) def _report_exception(self): """Internal function.""" - import sys exc, val, tb = sys.exc_info() root = self._root() root.report_callback_exception(exc, val, tb) @@ -1663,7 +1662,7 @@ class Tk(Misc, Wm): # ensure that self.tk is always _something_. self.tk = None if baseName is None: - import sys, os + import os baseName = os.path.basename(sys.argv[0]) baseName, ext = os.path.splitext(baseName) if ext not in ('.py', '.pyc', '.pyo'): @@ -1737,7 +1736,7 @@ class Tk(Misc, Wm): exec(open(base_py).read(), dir) def report_callback_exception(self, exc, val, tb): """Internal function. It reports exception on sys.stderr.""" - import traceback, sys + import traceback sys.stderr.write("Exception in Tkinter callback\n") sys.last_type = exc sys.last_value = val diff --git a/Lib/tkinter/filedialog.py b/Lib/tkinter/filedialog.py index 98d2d5c..3ffb252 100644 --- a/Lib/tkinter/filedialog.py +++ b/Lib/tkinter/filedialog.py @@ -306,7 +306,6 @@ class _Dialog(commondialog.Dialog): def _fixresult(self, widget, result): if result: # keep directory and filename until next time - import os # convert Tcl path objects to strings try: result = result.string @@ -333,7 +332,6 @@ class Open(_Dialog): # multiple results: result = tuple([getattr(r, "string", r) for r in result]) if result: - import os path, file = os.path.split(result[0]) self.options["initialdir"] = path # don't set initialfile or filename, as we have multiple of these |