[Zope-Checkins] SVN: Zope/trunk/utilities/mkzopeinstance.py - Revert to sha1. Andreas said he added SHA256 to AuthEncoding but I can't find it.

2008-11-14 Thread Sidnei da Silva 
Log message for revision 92941:
   - Revert to sha1. Andreas said he added SHA256 to AuthEncoding but I can't 
find it.

Changed:
  U   Zope/trunk/utilities/mkzopeinstance.py

-=-
Modified: Zope/trunk/utilities/mkzopeinstance.py
===
--- Zope/trunk/utilities/mkzopeinstance.py  2008-11-14 19:12:22 UTC (rev 
92940)
+++ Zope/trunk/utilities/mkzopeinstance.py  2008-11-14 20:26:21 UTC (rev 
92941)
@@ -168,12 +168,12 @@
 def write_inituser(fn, user, password):
 import binascii
 try:
-from hashlib import sha256 as sha
+from hashlib import sha1 as sha
 except:
 from sha import new as sha
 fp = open(fn, "w")
 pw = binascii.b2a_base64(sha(password).digest())[:-1]
-fp.write('%s:{SHA256}%s\n' % (user, pw))
+fp.write('%s:{SHA}%s\n' % (user, pw))
 fp.close()
 os.chmod(fn, 0644)
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Made Five.testbrowser compatible with mechanize 0.1.7b.

2008-11-14 Thread Hanno Schlichting 
Log message for revision 92936:
  Made Five.testbrowser compatible with mechanize 0.1.7b.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Products/Five/testbrowser.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2008-11-14 17:20:54 UTC (rev 92935)
+++ Zope/trunk/doc/CHANGES.txt  2008-11-14 17:22:07 UTC (rev 92936)
@@ -219,6 +219,8 @@
 
 Bugs Fixed
 
+  - Made Five.testbrowser compatible with mechanize 0.1.7b.
+
   - Ensure that response header values cannot embed CRLF pairs, which
 violate the HTTP spec (RFC 2616).
 

Modified: Zope/trunk/lib/python/Products/Five/testbrowser.py
===
--- Zope/trunk/lib/python/Products/Five/testbrowser.py  2008-11-14 17:20:54 UTC 
(rev 92935)
+++ Zope/trunk/lib/python/Products/Five/testbrowser.py  2008-11-14 17:22:07 UTC 
(rev 92936)
@@ -92,13 +92,13 @@
 default_others = ['_http_error', '_http_request_upgrade',
   '_http_default_error']
 default_features = ['_redirect', '_cookies', '_referer', '_refresh',
-'_equiv', '_basicauth', '_digestauth', '_seek' ]
+'_equiv', '_basicauth', '_digestauth' ]
 
 def __init__(self, *args, **kws):
 inherited_handlers = ['_unknown', '_http_error',
 '_http_request_upgrade', '_http_default_error', '_basicauth',
 '_digestauth', '_redirect', '_cookies', '_referer',
-'_refresh', '_equiv', '_seek', '_gzip']
+'_refresh', '_equiv', '_gzip']
 
 self.handler_classes = {"http": PublisherHTTPHandler}
 for name in inherited_handlers:

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/lib/python/OFS/ follow-up to r92860...unrestrictedTraverse also needs to acquisition-wrap implicit acquirers found via adaptation (fixing regression from merge of phili

2008-11-14 Thread David Glick 
Log message for revision 92919:
  follow-up to r92860...unrestrictedTraverse also needs to acquisition-wrap 
implicit acquirers found via adaptation (fixing regression from merge of 
philikon-aq branch)

Changed:
  U   Zope/trunk/lib/python/OFS/Traversable.py
  U   Zope/trunk/lib/python/OFS/tests/testTraverse.py

-=-
Modified: Zope/trunk/lib/python/OFS/Traversable.py
===
--- Zope/trunk/lib/python/OFS/Traversable.py2008-11-13 23:44:57 UTC (rev 
92918)
+++ Zope/trunk/lib/python/OFS/Traversable.py2008-11-14 08:22:19 UTC (rev 
92919)
@@ -263,6 +263,8 @@
  Interface, name)
 
 if next is not None:
+if IAcquirer.providedBy(next):
+next = next.__of__(obj)
 if restricted and not validate(obj, obj, name, next):
 raise Unauthorized(name)
 elif bobo_traverse is not None:

Modified: Zope/trunk/lib/python/OFS/tests/testTraverse.py
===
--- Zope/trunk/lib/python/OFS/tests/testTraverse.py 2008-11-13 23:44:57 UTC 
(rev 92918)
+++ Zope/trunk/lib/python/OFS/tests/testTraverse.py 2008-11-14 08:22:19 UTC 
(rev 92919)
@@ -397,6 +397,7 @@
 self.failUnless(
 self.folder1.unrestrictedTraverse('+something') is 'plus')
 
+
 import os, sys
 if __name__ == '__main__':
 execfile(os.path.join(sys.path[0], 'framework.py'))
@@ -468,6 +469,13 @@
   ... name="raise-keyerror"
   ... permission="zope2.Public"
   ... />
+  ... 
+  ... 
   ... '''
   >>> zcml.load_string(configure_zcml)
 
@@ -526,7 +534,14 @@
   ... 'an_attribute').index_html({})
   'an_attribute'
 
+If we traverse to something via an adapter lookup and it provides 
IAcquirer,
+it should get acquisition-wrapped so we can acquire attributes implicitly:
+
+  >>> acquirer = self.folder.unrestrictedTraverse('acquirer')
+  >>> acquirer.fancy
+  
 
+
 Clean up:
 
   >>> from zope.app.testing.placelesssetup import tearDown

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins