Ticket #5387: 5387.patch

test/test_defgen.py

@@ -175 +175 @@
 
 
 
-## This has to be in a string so the new yield syntax doesn't cause a
-## syntax error in Python 2.4 and before.
-inlineCallbacksTestsSource = '''
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 class InlineCallbacksTests(BaseDefgenTests, unittest.TestCase):
@@ -295 +292 @@
 
         self.assertIn("inlineCallbacks",
             str(self.assertRaises(TypeError, _noYield)))
-
-'''
-
-if sys.version_info > (2, 5):
-    # Load tests
-    exec inlineCallbacksTestsSource
-else:
-    # Make a placeholder test case
-    class InlineCallbacksTests(unittest.TestCase):
-        skip = "defer.defgen doesn't run on python < 2.5."
-        def test_everything(self):
-            pass

python/filepath.py

@@ -53 +53 @@
     return False
 
 
-def _stub_urandom(n):
-    """
-    Provide random data in versions of Python prior to 2.4.  This is an
-    effectively compatible replacement for 'os.urandom'.
-
-    @type n: L{int}
-    @param n: the number of bytes of data to return
-    @return: C{n} bytes of random data.
-    @rtype: str
-    """
-    randomData = [random.randrange(256) for n in xrange(n)]
-    return ''.join(map(chr, randomData))
-
-
 def _stub_armor(s):
     """
     ASCII-armor for random data.  This uses a hex encoding, although we will
@@ -76 +62 @@
     return s.encode('hex')
 
 islink = getattr(os.path, 'islink', _stub_islink)
-randomBytes = getattr(os, 'urandom', _stub_urandom)
+randomBytes = os.urandom # Retained for historic usage.
 armor = getattr(base64, 'urlsafe_b64encode', _stub_armor)
 
 class InsecurePath(Exception):
@@ -132 +118 @@
     """
     Create a pseudorandom, 16-character string for use in secure filenames.
     """
-    return armor(sha1(randomBytes(64)).digest())[:16]
+    return armor(sha1(os.urandom(64)).digest())[:16]
 
 
 

python/util.py

@@ -790 +790 @@
     Return the id of an object as an unsigned number so that its hex
     representation makes sense.
 
-    This is mostly necessary in Python 2.4 which implements L{id} to sometimes
-    return a negative value.  Python 2.3 shares this behavior, but also
+    This is mostly necessary in Python 2.4 which implements L{id} to sometimes 
+    return a negative value.  Python 2.3 shares this behavior, but also 
     implements hex and the %x format specifier to represent negative values as
-    though they were positive ones, obscuring the behavior of L{id}.  Python
+    though they were positive ones, obscuring the behavior of L{id}.  Python 
     2.5's implementation of L{id} always returns positive values.
     """
     rval = _idFunction(obj)

python/dist.py

@@ -360 +360 @@
 
     On recent versions of Python, will use C{platform.python_implementation}.
     On 2.5, it will try to extract the implementation from sys.subversion. On
-    older versions (currently the only supported older version is 2.4), checks
+    older versions, checks
     if C{__pypy__} is in C{sys.modules}, since PyPy is the implementation we
     really care about. If it isn't, assumes CPython.
 

topfiles/5387.doc

@@ +1 @@
+twisted.internet.defer.inlineCallbacks, removed Python 2.4 warnings and examples, as no longer supported.
+twisted.python.dist._checkCPython, removed Python 2.4 as only supported older version.
+twisted.trial.test.mockdoctest, Removed Python 2.4 reference.

topfiles/5387.removal

@@ +1 @@
+twisted.python.filepath.randomByres, no longer falls back to _stub_urandom. Uses os.urandom at all times
+twisted.test.test_defgen, removed hack for preventing yield syntax from breaking test runner.
+twisted.trial.runner.DocTestCase, removed as deprecated since Tornadio 8.0
+twisted.trial.unittest.TestSuite, removed over-rides to __call__ and run. No longer needed due to Python 2.4 support drop.
+twisted.trial.util.profiled, removed Python 2.4 hotshot hack. No longer required.

internet/defer.py

@@ -1124 +1124 @@
 
 def inlineCallbacks(f):
     """
-    WARNING: this function will not work in Python 2.4 and earlier!
-
     inlineCallbacks helps you write Deferred-using code that looks like a
     regular sequential function. This function uses features of Python 2.5
-    generators.  If you need to be compatible with Python 2.4 or before, use
-    the L{deferredGenerator} function instead, which accomplishes the same
-    thing, but with somewhat more boilerplate.  For example::
-
-        @inlineCallBacks
-        def thingummy():
-            thing = yield makeSomeRequestResultingInDeferred()
-            print thing #the result! hoorj!
-
+    generators.
+    
     When you call anything that results in a L{Deferred}, you can simply yield it;
     your generator will automatically be resumed when the Deferred's result is
     available. The generator will be sent the result of the L{Deferred} with the

trial/test/mockdoctest.py

@@ -2 +2 @@
 # See LICENSE for details.
 
 # this module is a trivial class with doctests and a __test__ attribute
-# to test trial's doctest support with python2.4
+# to test trial's doctest support.
 
 
 class Counter(object):

trial/runner.py

@@ -11 +11 @@
 __all__ = [
     'suiteVisit', 'TestSuite',
 
-    'DestructiveTestSuite', 'DocTestCase', 'DryRunVisitor',
+    'DestructiveTestSuite', 'DryRunVisitor',
     'ErrorHolder', 'LoggedSuite', 'PyUnitTestCase',
     'TestHolder', 'TestLoader', 'TrialRunner', 'TrialSuite',
 
@@ -239 +239 @@
 
 
 
-class DocTestCase(PyUnitTestCase):
-    """
-    DEPRECATED in Twisted 8.0.
-    """
-
-    def id(self):
-        """
-        In Python 2.4, doctests have correct id() behaviour. In Python 2.3,
-        id() returns 'runit'.
-
-        Here we override id() so that at least it will always contain the
-        fully qualified Python name of the doctest.
-        """
-        return self._test.shortDescription()
-
-
 class TrialSuite(TestSuite):
     """
     Suite to wrap around every single test in a C{trial} run. Used internally

trial/util.py

@@ -208 +208 @@
 
 def profiled(f, outputFile):
     def _(*args, **kwargs):
-        if sys.version_info[0:2] != (2, 4):
-            import profile
-            prof = profile.Profile()
-            try:
-                result = prof.runcall(f, *args, **kwargs)
-                prof.dump_stats(outputFile)
-            except SystemExit:
-                pass
-            prof.print_stats()
-            return result
-        else: # use hotshot, profile is broken in 2.4
-            import hotshot.stats
-            prof = hotshot.Profile(outputFile)
-            try:
-                return prof.runcall(f, *args, **kwargs)
-            finally:
-                stats = hotshot.stats.load(outputFile)
-                stats.strip_dirs()
-                stats.sort_stats('cum')   # 'time'
-                stats.print_stats(100)
+        import profile
+        prof = profile.Profile()
+        try:
+            result = prof.runcall(f, *args, **kwargs)
+            prof.dump_stats(outputFile)
+        except SystemExit:
+            pass
+        prof.print_stats()
+        return result
     return _
 
 

trial/unittest.py

@@ -1392 +1392 @@
 class TestSuite(pyunit.TestSuite):
     """
     Extend the standard library's C{TestSuite} with support for the visitor
-    pattern and a consistently overrideable C{run} method.
+    pattern.
     """
 
     visit = suiteVisit
 
-    def __call__(self, result):
-        return self.run(result)
-
-
-    def run(self, result):
-        """
-        Call C{run} on every member of the suite.
-        """
-        # we implement this because Python 2.3 unittest defines this code
-        # in __call__, whereas 2.4 defines the code in run.
-        for test in self._tests:
-            if result.shouldStop:
-                break
-            test(result)
-        return result
-
-
 
 class TestDecorator(components.proxyForInterface(itrial.ITestCase,
                                                  "_originalTest")):

web/test/test_xmlrpc.py

@@ -575 +575 @@
     value = None
 
 
-try:
-    xmlrpclib.loads(xmlrpclib.dumps(({}, {})), use_datetime=True)
-except TypeError:
-    _datetimeSupported = False
-else:
-    _datetimeSupported = True
-
-
-
 class XMLRPCUseDateTimeTestCase(SerializationConfigMixin, unittest.TestCase):
     """
     Tests for passing a C{datetime.datetime} instance when the C{useDateTime}
@@ -592 +583 @@
     flagName = "useDateTime"
     value = datetime.datetime(2000, 12, 28, 3, 45, 59)
 
-    if not _datetimeSupported:
-        skip = (
-            "Available version of xmlrpclib does not support datetime "
-            "objects.")
-
-
-
-class XMLRPCDisableUseDateTimeTestCase(unittest.TestCase):
-    """
-    Tests for the C{useDateTime} flag on Python 2.4.
-    """
-    if _datetimeSupported:
-        skip = (
-            "Available version of xmlrpclib supports datetime objects.")
-
-    def test_cannotInitializeWithDateTime(self):
-        """
-        L{XMLRPC} raises L{RuntimeError} if passed C{True} for C{useDateTime}.
-        """
-        self.assertRaises(RuntimeError, XMLRPC, useDateTime=True)
-        self.assertRaises(
-            RuntimeError, Proxy, "http://localhost/", useDateTime=True)
-
-
-    def test_cannotSetDateTime(self):
-        """
-        Setting L{XMLRPC.useDateTime} to C{True} after initialization raises
-        L{RuntimeError}.
-        """
-        xmlrpc = XMLRPC(useDateTime=False)
-        self.assertRaises(RuntimeError, setattr, xmlrpc, "useDateTime", True)
-        proxy = Proxy("http://localhost/", useDateTime=False)
-        self.assertRaises(RuntimeError, setattr, proxy, "useDateTime", True)
-
-
 
 class XMLRPCTestAuthenticated(XMLRPCTestCase):
     """

web/topfiles/5387.removal

@@ +1 @@
+twisted.web.client.FileBodyProducer, removed hard-code default for _SEEK_SET, _SEEK_END. Both available in os in >= 2.5
+twisted.web.xmlrpclib, removed Datetime.decode hack for Python versions < 2.5
+twisted.web.test.text_xmlrpc.XMLRPCDisableUseDateTimeTestCase, removed test specific to Python 2.4 support

web/xmlrpc.py

@@ -28 +28 @@
 Boolean = xmlrpclib.Boolean
 DateTime = xmlrpclib.DateTime
 
-# On Python 2.4 and earlier, DateTime.decode returns unicode.
-if sys.version_info[:2] < (2, 5):
-    _decode = DateTime.decode
-    DateTime.decode = lambda self, value: _decode(self, value.encode('ascii'))
-
 
 def withRequest(f):
     """
@@ -128 +123 @@
 
 
     def __setattr__(self, name, value):
-        if name == "useDateTime" and value and sys.version_info[:2] < (2, 5):
-            raise RuntimeError("useDateTime requires Python 2.5 or later.")
         self.__dict__[name] = value
 
 

web/client.py

@@ -720 +720 @@
     """
     implements(IBodyProducer)
 
-    # Python 2.4 doesn't have these symbolic constants
-    _SEEK_SET = getattr(os, 'SEEK_SET', 0)
-    _SEEK_END = getattr(os, 'SEEK_END', 2)
+    _SEEK_SET = os.SEEK_SET
+    _SEEK_END = os.SEEK_END
 
     def __init__(self, inputFile, cooperator=task, readSize=2 ** 16):
         self._inputFile = inputFile