[Collab-qa-commits] r225 - fileconflicts

[filippo at alioth.debian.org]

Author: filippo
Date: 2007-06-08 16:13:28 +0000 (Fri, 08 Jun 2007)
New Revision: 225

Modified:
   fileconflicts/get-conflicts.py
   fileconflicts/parse-contents.py
   fileconflicts/query-contents.py
Log:
use binary format for cPickle, use generators instead of readlines()

Modified: fileconflicts/get-conflicts.py
===================================================================
--- fileconflicts/get-conflicts.py	2007-06-07 18:36:43 UTC (rev 224)
+++ fileconflicts/get-conflicts.py	2007-06-08 16:13:28 UTC (rev 225)
@@ -29,7 +29,7 @@
     except KeyError:
     	pass
 
-f = open(sys.argv[2], 'r')
+f = open(sys.argv[2], 'rb')
 dups = cPickle.load(f)
 f.close()
 

Modified: fileconflicts/parse-contents.py
===================================================================
--- fileconflicts/parse-contents.py	2007-06-07 18:36:43 UTC (rev 224)
+++ fileconflicts/parse-contents.py	2007-06-08 16:13:28 UTC (rev 225)
@@ -14,16 +14,17 @@
         sys.exit(1)
 
     f = gzip.open(sys.argv[1])
-    for l in f.readlines():
+#    for l in f.readlines():
+    for l in f:
         m = dup_re.match(l)
         if m:
             # file -> list_of_packages
             dups[m.group(1)] = [ x.split('/')[-1] for x in m.group(2).split(',')]
+    f.close()
 
+    f = open(sys.argv[2], 'wb')
+    cPickle.dump(dups, f, 2)
     f.close()
-    f = open(sys.argv[2], 'w')
-    cPickle.dump(dups, f)
-    f.close()
 
 if __name__ == '__main__':
     main()

Modified: fileconflicts/query-contents.py
===================================================================
--- fileconflicts/query-contents.py	2007-06-07 18:36:43 UTC (rev 224)
+++ fileconflicts/query-contents.py	2007-06-08 16:13:28 UTC (rev 225)
@@ -10,7 +10,7 @@
         print "usage: contents.db [package]"
         sys.exit(1)
     
-    f = open(sys.argv[1], 'r')
+    f = open(sys.argv[1], 'rb')
     dups = cPickle.load(f)
     f.close()