[yum-cvs] yum/rpmUtils miscutils.py, 1.15.2.1, 1.15.2.2 updates.py, 1.23.2.1, 1.23.2.2

[James Bowes]

Update of /home/groups/yum/cvs/yum/rpmUtils
In directory login1.linux.duke.edu:/tmp/cvs-serv16579/rpmUtils

Modified Files:
      Tag: yum-3_0_X
	miscutils.py updates.py 
Log Message:
Revert previous pychecker fixes patch, since I broke things good and proper

Index: miscutils.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/miscutils.py,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -r1.15.2.1 -r1.15.2.2
--- miscutils.py	5 Dec 2006 00:44:26 -0000	1.15.2.1
+++ miscutils.py	5 Dec 2006 14:03:33 -0000	1.15.2.2
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # Copyright 2003 Duke University
 
+import string
 import rpm
 import types
 import gzip
@@ -239,16 +240,16 @@
     if filename[-4:] == '.rpm':
         filename = filename[:-4]
        
-    archIndex = filename.rfind('.')
+    archIndex = string.rfind(filename, '.')
     arch = filename[archIndex+1:]
 
-    relIndex = filename[:archIndex].rfind('-')
+    relIndex = string.rfind(filename[:archIndex], '-')
     rel = filename[relIndex+1:archIndex]
 
-    verIndex = filename[:relIndex].rfind('-')
+    verIndex = string.rfind(filename[:relIndex], '-')
     ver = filename[verIndex+1:relIndex]
 
-    epochIndex = filename.find(':')
+    epochIndex = string.find(filename, ':')
     if epochIndex == -1:
         epoch = ''
     else:
@@ -312,16 +313,16 @@
 def stringToVersion(verstring):
     if verstring is None:
         return ('0', None, None)
-    i = verstring.find(':')
+    i = string.find(verstring, ':')
     if i != -1:
         try:
-            epoch = long(verstring[:i])
+            epoch = string.atol(verstring[:i])
         except ValueError:
             # look, garbage in the epoch field, how fun, kill it
             epoch = '0' # this is our fallback, deal
     else:
         epoch = '0'
-    j = verstring.find('-')
+    j = string.find(verstring, '-')
     if j != -1:
         if verstring[i + 1:j] == '':
             version = None

Index: updates.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/updates.py,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- updates.py	5 Dec 2006 00:44:26 -0000	1.23.2.1
+++ updates.py	5 Dec 2006 14:03:33 -0000	1.23.2.2
@@ -14,9 +14,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 # Copyright 2004 Duke University
 
-import rpmUtils
 import rpmUtils.miscutils
 import rpmUtils.arch
+import rpmUtils
 
 class Updates:
     """This class computes and keeps track of updates and obsoletes.