Python 2.3 workarounds cleanup

Author: techtonik

roundup/anypy/TODO.txt

@@ -1,8 +1,4 @@
 Python compatiblity TODO
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-- the popen2 module is deprecated as of Python 2.6;
-  the subprocess module is available since Python 2.4,
-  thus a roundup.anypy.subprocess_ module is needed
-
-# vim: si
+Remove sets_ included for Python 2.3 compatibility.

roundup/backends/__init__.py

@@ -40,20 +40,9 @@ def get_backend(name):
         return vars[name]
     # import the backend module
     module_name = 'back_%s' % name
-    try:
-        module = __import__(module_name, vars)
-    except:
-        # import failed, but in versions prior to 2.4, a (broken)
-        # module is left in sys.modules and package globals;
-        # subsequent imports would succeed and get the broken module.
-        # This no longer happens in Python 2.4 and later.
-        if sys.version_info < (2, 4):
-            del sys.modules['.'.join((__name__, module_name))]
-            del vars[module_name]
-        raise
-    else:
-        vars[name] = module
-        return module
+    module = __import__(module_name, vars)
+    vars[name] = module
+    return module
 
 def have_backend(name):
     '''Is backend "name" available?'''

roundup/backends/indexer_common.py

@@ -1,6 +1,4 @@
 import re
-# Python 2.3 ... 2.6 compatibility:
-from roundup.anypy.sets_ import set
 
 from roundup import hyperdb
 

roundup/backends/indexer_rdbms.py

@@ -3,8 +3,6 @@
 propname, itemid) instances.
 """
 import re
-# Python 2.3 ... 2.6 compatibility:
-from roundup.anypy.sets_ import set
 
 from roundup.backends.indexer_common import Indexer as IndexerBase
 

roundup/hyperdb.py

@@ -22,8 +22,6 @@
 
 # standard python modules
 import os, re, shutil, weakref
-# Python 2.3 ... 2.6 compatibility:
-from roundup.anypy.sets_ import set
 
 # roundup modules
 import date, password

run_tests.py

@@ -813,12 +813,7 @@ def process_args(argv=None):
         gc.set_debug(gcdebug)
 
     if build:
-        # Python 2.3 is more sane in its non -q output
-        if sys.hexversion >= 0x02030000:
-            qflag = ""
-        else:
-            qflag = "-q"
-        cmd = sys.executable + " setup.py " + qflag + " build"
+        cmd = sys.executable + " setup.py build"
         if build_inplace:
             cmd += "_ext -i"
         if VERBOSE:

scripts/import_sf.py

@@ -22,8 +22,6 @@
 """
 
 import sys, os, csv, time, urllib2, httplib, mimetypes, urlparse
-# Python 2.3 ... 2.6 compatibility:
-from roundup.anypy.sets_ import set
 
 try:
     import cElementTree as ElementTree

share/roundup/templates/classic/detectors/nosyreaction.py

@@ -16,9 +16,6 @@
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
 
-# Python 2.3 ... 2.6 compatibility:
-from roundup.anypy.sets_ import set
-
 from roundup import roundupdb, hyperdb
 
 def nosyreaction(db, cl, nodeid, oldvalues):

test/db_test_base.py

@@ -17,8 +17,6 @@
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, base64, os.path
 import gpgmelib
-# Python 2.3 ... 2.6 compatibility:
-from roundup.anypy.sets_ import set
 from email.parser import FeedParser
 
 from roundup.hyperdb import String, Password, Link, Multilink, Date, \

test/test_anypy_hashlib.py

@@ -107,7 +107,6 @@ def test_sha_expected(self):
             for src, SHA, MD5 in self.data_for_test:
                 self.assertEqual(sha.sha(src).hexdigest(), SHA)
 
-        # fails for me with Python 2.3; unittest module bug?
         def test_sha_new_expected(self):
             """sha.new is sha.sha, or at least yields expected results"""
             if sha.new is sha.sha: