[Checkins] SVN: zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.py Small but significant differences for Python 3.

Lennart Regebro regebro at gmail.com
Wed Nov 24 03:39:38 EST 2010


Log message for revision 118545:
  Small but significant differences for Python 3.
  

Changed:
  U   zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.py

-=-
Modified: zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.py	2010-11-24 07:43:50 UTC (rev 118544)
+++ zc.buildout/branches/regebro-python3/src/zc/buildout/buildout.py	2010-11-24 08:39:37 UTC (rev 118545)
@@ -1294,6 +1294,11 @@
 
     def __iter__(self):
         return iter(self._raw)
+    
+    def __eq__(self, other):
+        if isinstance(other, Options):
+            return self._data == other._data
+        return dict(self) == other
 
     def keys(self):
         raw = self._raw
@@ -1497,7 +1502,8 @@
         hash.update((' '.join(dirnames)).encode())
         hash.update((' '.join(filenames)).encode())
         for name in filenames:
-            hash.update(open(os.path.join(dirpath, name)).read().encode())
+            hash.update(open(os.path.join(dirpath, name), 'rb').read())
+
     return str(base64.b64encode(hash.digest()).strip())
 
 def _dists_sig(dists):



More information about the checkins mailing list