Merged revisions 65787 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65787 | brett.cannon | 2008-08-17 15:10:11 -0700 (Sun, 17 Aug 2008) | 3 lines

  Remove imports of 'warnings' that are no longer needed in dummy_thread,
  filecmp, and shelve.
........

diff --git a/Lib/_dummy_thread.py b/Lib/_dummy_thread.py
index e03905c203764afad3e80c62be596fbcc6347ade..7aa6579efe4e2ce3246598192d96ea2de57e1695 100644 (file)
--- a/Lib/_dummy_thread.py
+++ b/Lib/_dummy_thread.py
@@ -17,7 +17,6 @@ __all__ = ['error', 'start_new_thread', 'exit', 'get_ident', 'allocate_lock',
            'interrupt_main', 'LockType']
 
 import traceback as _traceback
-import warnings
 
 class error(Exception):
     """Dummy implementation of _thread.error."""

diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index 68a8321decbd24d616be2f96459b635b8389ae93..6dcebaa23dfc75f9a8645b7f3c9cf63edbe413a8 100644 (file)
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -11,7 +11,6 @@ Functions:
 
 import os
 import stat
-import warnings
 from itertools import filterfalse
 
 __all__ = ["cmp","dircmp","cmpfiles"]

diff --git a/Lib/shelve.py b/Lib/shelve.py
index c8d9cf529478b6633e7fcb4b2cf44490c3aa0b7c..cf6dac65f47e08d2f2b1383e53b7bafa3feaa8b6 100644 (file)
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -60,7 +60,6 @@ from pickle import Pickler, Unpickler
 from io import BytesIO
 
 import collections
-import warnings
 
 __all__ = ["Shelf","BsdDbShelf","DbfilenameShelf","open"]