Merge remove-pre-split-code-3581-2

Author: thijs, exarkun Reviewer: exarkun, mwh Fixes: twisted#3581 Remove the compatibility layer added for modules which were moved to new locations for the 2.0 split. git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@26541 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
dansut · Mar 30, 2009 · 0058516 · 0058516
1 parent ba532b4
commit 0058516
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 150 deletions.
diff --git a/twisted/im.py b/twisted/im.py
diff --git a/twisted/protocols/dns.py b/twisted/protocols/dns.py
diff --git a/twisted/protocols/ethernet.py b/twisted/protocols/ethernet.py
diff --git a/twisted/protocols/http.py b/twisted/protocols/http.py
diff --git a/twisted/protocols/imap4.py b/twisted/protocols/imap4.py
diff --git a/twisted/protocols/ip.py b/twisted/protocols/ip.py
diff --git a/twisted/protocols/irc.py b/twisted/protocols/irc.py
diff --git a/twisted/protocols/jabber.py b/twisted/protocols/jabber.py
diff --git a/twisted/protocols/msn.py b/twisted/protocols/msn.py
diff --git a/twisted/protocols/nntp.py b/twisted/protocols/nntp.py
diff --git a/twisted/protocols/oscar.py b/twisted/protocols/oscar.py
diff --git a/twisted/protocols/pop3.py b/twisted/protocols/pop3.py
diff --git a/twisted/protocols/raw.py b/twisted/protocols/raw.py
diff --git a/twisted/protocols/rawudp.py b/twisted/protocols/rawudp.py
diff --git a/twisted/protocols/smtp.py b/twisted/protocols/smtp.py
diff --git a/twisted/protocols/sux.py b/twisted/protocols/sux.py
diff --git a/twisted/protocols/toc.py b/twisted/protocols/toc.py
diff --git a/twisted/python/test/test_util.py b/twisted/python/test/test_util.py
@@ -126,6 +126,20 @@ def test_gidFromGroupnameString(self):
             "Group Name/GID conversion requires the grp module.")
 
 
+    def test_moduleMovedForSplitDeprecation(self):
+        """
+        Calling L{moduleMovedForSplit} results in a deprecation warning.
+        """
+        util.moduleMovedForSplit("foo", "bar", "baz", "quux", "corge", {})
+        warnings = self.flushWarnings(
+            offendingFunctions=[self.test_moduleMovedForSplitDeprecation])
+        self.assertEquals(
+            warnings[0]['message'],
+            "moduleMovedForSplit is deprecated since Twisted 9.0.")
+        self.assertEquals(warnings[0]['category'], DeprecationWarning)
+        self.assertEquals(len(warnings), 1)
+
+
 
 class TestMergeFunctionMetadata(unittest.TestCase):
     """

diff --git a/twisted/python/util.py b/twisted/python/util.py
@@ -332,8 +332,9 @@ def str_xor(s, b):
     return ''.join([chr(ord(c) ^ b) for c in s])
 
 def keyed_md5(secret, challenge):
-    """Create the keyed MD5 string for the given secret and challenge."""
-    import warnings
+    """
+    Create the keyed MD5 string for the given secret and challenge.
+    """
     warnings.warn(
         "keyed_md5() is deprecated.  Use the stdlib module hmac instead.",
         DeprecationWarning, stacklevel=2
@@ -716,38 +717,13 @@ def getvalue(self):
 
 def moduleMovedForSplit(origModuleName, newModuleName, moduleDesc,
                         projectName, projectURL, globDict):
-    from twisted.python import reflect
-    modoc = """
-%(moduleDesc)s
-
-This module is DEPRECATED. It has been split off into a third party
-package, Twisted %(projectName)s. Please see %(projectURL)s.
-
-This is just a place-holder that imports from the third-party %(projectName)s
-package for backwards compatibility. To use it, you need to install
-that package.
-""" % {'moduleDesc': moduleDesc,
-       'projectName': projectName,
-       'projectURL': projectURL}
-
-    #origModule = reflect.namedModule(origModuleName)
-    try:
-        newModule = reflect.namedModule(newModuleName)
-    except ImportError:
-        raise ImportError("You need to have the Twisted %s "
-                          "package installed to use %s. "
-                          "See %s."
-                          % (projectName, origModuleName, projectURL))
-
-    # Populate the old module with the new module's contents
-    for k,v in vars(newModule).items():
-        globDict[k] = v
-    globDict['__doc__'] = modoc
-    import warnings
-    warnings.warn("%s has moved to %s. See %s." % (origModuleName, newModuleName,
-                                                   projectURL),
-                  DeprecationWarning, stacklevel=3)
-    return
+    """
+    No-op function; only present for backwards compatibility.  There is no
+    reason to call this function.
+    """
+    warnings.warn(
+        "moduleMovedForSplit is deprecated since Twisted 9.0.",
+        DeprecationWarning, stacklevel=2)
 
 
 def untilConcludes(f, *a, **kw):
@@ -951,5 +927,5 @@ def runAsEffectiveUser(euid, egid, function, *args, **kwargs):
     "raises", "IntervalDifferential", "FancyStrMixin", "FancyEqMixin",
     "dsu", "switchUID", "SubclassableCStringIO", "moduleMovedForSplit",
     "unsignedID", "mergeFunctionMetadata", "nameToLabel", "uidFromString",
-    "gidFromString", "runAsEffectiveUser",
+    "gidFromString", "runAsEffectiveUser", "moduleMovedForSplit",
 ]