more modernisation

Author: Richard Jones

2to3-done.txt

@@ -2,19 +2,9 @@ CAN'T VERIFY
 
 ./roundup/backends/back_mysql.py
 ./roundup/backends/back_tsearch2.py
-./roundup/backends/indexer_xapian.py
 
 TODO
 
-./roundup/backends/sessions_dbm.py
-./roundup/backends/sessions_rdbms.py
-./roundup/backends/tsearch2_setup.py
-./roundup/cgi/__init__.py
-./roundup/cgi/accept_language.py
-./roundup/cgi/actions.py
-./roundup/cgi/apache.py
-./roundup/cgi/cgitb.py
-./roundup/cgi/client.py
 ./roundup/cgi/exceptions.py
 ./roundup/cgi/form_parser.py
 ./roundup/cgi/MultiMapping.py
@@ -133,24 +123,37 @@ TODO
 ./frontends/ZRoundup/ZRoundup.py
 
 
-
 DONE
 
 ./doc/conf.py
-./roundup/__init__.py
 ./roundup/admin.py
-./roundup/actions.py
-./roundup/anypy/__init__.py
-./roundup/anypy/hashlib_.py
-./roundup/anypy/sets_.py
 ./roundup/backends/__init__.py
 ./roundup/backends/back_anydbm.py
 ./roundup/backends/back_postgresql.py
 ./roundup/backends/back_sqlite.py
-./roundup/backends/blobfiles.py
 ./roundup/backends/indexer_common.py
 ./roundup/backends/indexer_dbm.py
 ./roundup/backends/indexer_rdbms.py
 ./roundup/backends/locking.py
 ./roundup/backends/portalocker.py
 ./roundup/backends/rdbms_common.py
+./roundup/backends/sessions_dbm.py
+./roundup/backends/sessions_rdbms.py
+./roundup/cgi/accept_language.py
+./roundup/cgi/actions.py
+./roundup/cgi/cgitb.py
+
+
+NOTHING DONE
+
+./roundup/__init__.py
+./roundup/actions.py
+./roundup/anypy/__init__.py
+./roundup/anypy/hashlib_.py
+./roundup/anypy/sets_.py
+./roundup/backends/blobfiles.py
+./roundup/backends/indexer_xapian.py
+./roundup/backends/tsearch2_setup.py
+./roundup/cgi/__init__.py
+./roundup/cgi/apache.py
+./roundup/cgi/client.py

roundup/anypy/cookie_.py

@@ -0,0 +1,8 @@
+
+try:
+    from http import cookies as Cookie
+    from http.cookies import CookieError, BaseCookie, SimpleCookie
+    from http.cookies import _getdate as get_cookie_date
+except:
+    from Cookie import CookieError, BaseCookie, SimpleCookie
+    from Cookie import _getdate as get_cookie_date

roundup/anypy/http_.py

@@ -0,0 +1,5 @@
+try:
+    from http import client
+except:
+    import httplib as client
+

roundup/anypy/io_.py

@@ -0,0 +1,6 @@
+
+try:
+    from io import StringIO
+except:
+    from StringIO import StringIO
+

roundup/anypy/urllib_.py

@@ -0,0 +1,6 @@
+
+try:
+    from urllib.parse import quote, urlparse
+except:
+    from urllib import quote
+    from urlparse import urlparse

roundup/backends/indexer_dbm.py

@@ -168,7 +168,7 @@ def find(self, wordlist):
                     hits[k] = self.fileids[k]
             else:
                 # Eliminate hits for every non-match
-                for fileid in hits:
+                for fileid in list(hits):
                     if fileid not in entry:
                         del hits[fileid]
         if hits is None:

roundup/backends/sessions_dbm.py

@@ -7,9 +7,11 @@
 """
 __docformat__ = 'restructuredtext'
 
-import anydbm, whichdb, os, marshal, time
+import os, marshal, time
+
 from roundup import hyperdb
 from roundup.i18n import _
+from roundup.anypy.dbm_ import anydbm, whichdb
 
 class BasicDatabase:
     ''' Provide a nice encapsulation of an anydbm store.
@@ -26,7 +28,7 @@ def __init__(self, db):
     def exists(self, infoid):
         db = self.opendb('c')
         try:
-            return db.has_key(infoid)
+            return infoid in db
         finally:
             db.close()
 
@@ -46,8 +48,8 @@ def cache_db_type(self, path):
         if os.path.exists(path):
             db_type = whichdb.whichdb(path)
             if not db_type:
-                raise hyperdb.DatabaseError, \
-                    _("Couldn't identify database type")
+                raise hyperdb.DatabaseError(
+                    _("Couldn't identify database type"))
         elif os.path.exists(path+'.db'):
             # if the path ends in '.db', it's a dbm database, whether
             # anydbm says it's dbhash or not!
@@ -58,12 +60,12 @@ def cache_db_type(self, path):
     def get(self, infoid, value, default=_marker):
         db = self.opendb('c')
         try:
-            if db.has_key(infoid):
+            if infoid in db:
                 values = marshal.loads(db[infoid])
             else:
                 if default != self._marker:
                     return default
-                raise KeyError, 'No such %s "%s"'%(self.name, infoid)
+                raise KeyError('No such %s "%s"'%(self.name, infoid))
             return values.get(value, None)
         finally:
             db.close()
@@ -76,14 +78,14 @@ def getall(self, infoid):
                 del d['__timestamp']
                 return d
             except KeyError:
-                raise KeyError, 'No such %s "%s"'%(self.name, infoid)
+                raise KeyError('No such %s "%s"'%(self.name, infoid))
         finally:
             db.close()
 
     def set(self, infoid, **newvalues):
         db = self.opendb('c')
         try:
-            if db.has_key(infoid):
+            if infoid in db:
                 values = marshal.loads(db[infoid])
             else:
                 values = {'__timestamp': time.time()}
@@ -95,14 +97,14 @@ def set(self, infoid, **newvalues):
     def list(self):
         db = self.opendb('r')
         try:
-            return db.keys()
+            return list(db)
         finally:
             db.close()
 
     def destroy(self, infoid):
         db = self.opendb('c')
         try:
-            if db.has_key(infoid):
+            if infoid in db:
                 del db[infoid]
         finally:
             db.close()

roundup/backends/sessions_rdbms.py

@@ -36,7 +36,7 @@ def get(self, infoid, value, default=_marker):
         if not res:
             if default != self._marker:
                 return default
-            raise KeyError, 'No such %s "%s"'%(self.name, infoid)
+            raise KeyError('No such %s "%s"'%(self.name, infoid))
         values = eval(res[0])
         return values.get(value, None)
 
@@ -46,7 +46,7 @@ def getall(self, infoid):
             n, n, self.db.arg), (infoid,))
         res = self.cursor.fetchone()
         if not res:
-            raise KeyError, 'No such %s "%s"'%(self.name, infoid)
+            raise KeyError('No such %s "%s"'%(self.name, infoid))
         return eval(res[0])
 
     def set(self, infoid, **newvalues):

roundup/cgi/accept_language.py

@@ -35,7 +35,7 @@
 # both
 lre   = re.compile(nqlre + "|" + qlre)
 
-ascii = ''.join([chr(x) for x in xrange(256)])
+ascii = ''.join([chr(x) for x in range(256)])
 whitespace = ' \t\n\r\v\f'
 
 def parse(language_header):