Backported

r26524 | srichter | 2004-07-14 03:45:38 -0400 (Wed, 14 Jul 2004) | 6 lines
r26551 | srichter | 2004-07-15 03:06:37 -0400 (Thu, 15 Jul 2004) | 6 lines
r26522 | pruggera | 2004-07-14 01:42:06 -0400 (Wed, 14 Jul 2004) | 1 line
r26531 | pruggera | 2004-07-14 13:00:15 -0400 (Wed, 14 Jul 2004) | 1 line
r26534 | pruggera | 2004-07-14 15:55:34 -0400 (Wed, 14 Jul 2004) | 1 line
r26540 | pruggera | 2004-07-14 18:14:25 -0400 (Wed, 14 Jul 2004) | 1 line

extract.py

@@ -17,7 +17,6 @@
 
 $Id$
 """
-
 import os, sys, fnmatch
 import time
 import tokenize
@@ -27,15 +26,13 @@
 from interfaces import IPOTEntry, IPOTMaker, ITokenEater
 from zope.interface import implements
 
-__metaclass__ = type
-
 DEFAULT_CHARSET = 'UTF-8'
 DEFAULT_ENCODING = '8bit'
 
 pot_header = '''\
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003-2004 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -60,7 +57,7 @@
 
 '''
 
-class POTEntry:
+class POTEntry(object):
     """This class represents a single message entry in the POT file.
     """
     implements(IPOTEntry)
@@ -89,7 +86,7 @@ def write(self, file):
     def __cmp__(self, other):
         return cmp(self.comments, other.comments)
 
-class POTMaker:
+class POTMaker(object):
     """This class inserts sets of strings into a POT file.
     """
     implements(IPOTMaker)
@@ -137,7 +134,7 @@ def write(self):
 
         file.close()
 
-class TokenEater:
+class TokenEater(object):
     """This is almost 100% taken from pygettext.py, except that I
     removed all option handling and output a dictionary.