From: david-sarah <david-sarah@jacaranda.org>
Date: Thu, 18 Aug 2011 04:07:49 +0000 (-0700)
Subject: Cleanups for suppression of UserWarnings. refs #1435
X-Git-Tag: pre-393~10
X-Git-Url: https://git.rkrishnan.org/listings/FOOURL?a=commitdiff_plain;h=c41bf1402944057bdc059c8ae368be0ff075c5a9;p=tahoe-lafs%2Ftahoe-lafs.git

Cleanups for suppression of UserWarnings. refs #1435
---

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 06f8e15c..17e6ea0a 100644
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -144,8 +144,8 @@ def normalized_version(verstr, what=None):
 
 def get_package_versions_and_locations():
     import warnings
-    from _auto_deps import package_imports, deprecation_messages,  \
-        deprecation_imports, user_warning_messages
+    from _auto_deps import package_imports, deprecation_messages, \
+        user_warning_messages, warning_imports
 
     def package_dir(srcfile):
         return os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile))))
@@ -171,16 +171,16 @@ def get_package_versions_and_locations():
     for msg in user_warning_messages:
         warnings.filterwarnings("ignore", category=UserWarning, message=msg, append=True)
     try:
-        for modulename in deprecation_imports:
+        for modulename in warning_imports:
             try:
                 __import__(modulename)
             except ImportError:
                 pass
     finally:
-        for ign in deprecation_messages:
-            warnings.filters.pop()
         for ign in user_warning_messages:
             warnings.filters.pop()
+        for ign in deprecation_messages:
+            warnings.filters.pop()
 
     packages = []
 
diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 077c957b..aa649ce5 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -117,13 +117,13 @@ deprecation_messages = [
     "the sets module is deprecated",
 ]
 
-deprecation_imports = [
+user_warning_messages = [
+    "Hashing uninitialized InterfaceClass instance",
+]
+
+warning_imports = [
     'nevow',
     'twisted.persisted.sob',
     'twisted.python.filepath',
     'Crypto.Hash.SHA',
 ]
-
-user_warning_messages = [
-    "Hashing uninitialized InterfaceClass instance",
-]