[Checkins] SVN: zc.sharing/trunk/ 1.2 is new release number; 1.1 is for Zope 3.3, and 1.2 for Zope 3.4. Fix tests to pass with Zope 3.4. Up build to trunk. Add CHANGES and TODO, noting need to move to eggs in setup.py.

Gary Poster gary at zope.com
Mon Apr 30 22:38:09 EDT 2007


Log message for revision 74949:
  1.2 is new release number; 1.1 is for Zope 3.3, and 1.2 for Zope 3.4.  Fix tests to pass with Zope 3.4.  Up build to trunk.  Add CHANGES and TODO, noting need to move to eggs in setup.py.

Changed:
  A   zc.sharing/trunk/CHANGES.txt
  U   zc.sharing/trunk/bootstrap.py
  U   zc.sharing/trunk/buildout.cfg
  U   zc.sharing/trunk/setup.py
  A   zc.sharing/trunk/src/zc/sharing/CHANGES.txt
  A   zc.sharing/trunk/src/zc/sharing/TODO.txt
  U   zc.sharing/trunk/src/zc/sharing/browser/ftesting.zcml
  U   zc.sharing/trunk/src/zc/sharing/browser/ntests.py

-=-
Added: zc.sharing/trunk/CHANGES.txt
===================================================================
--- zc.sharing/trunk/CHANGES.txt	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/CHANGES.txt	2007-05-01 02:38:09 UTC (rev 74949)
@@ -0,0 +1 @@
+Please see CHANGES.txt in the package.


Property changes on: zc.sharing/trunk/CHANGES.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: zc.sharing/trunk/bootstrap.py
===================================================================
--- zc.sharing/trunk/bootstrap.py	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/bootstrap.py	2007-05-01 02:38:09 UTC (rev 74949)
@@ -31,14 +31,18 @@
 
 import pkg_resources
 
+cmd = 'from setuptools.command.easy_install import main; main()'
+if sys.platform == 'win32':
+    cmd = '"%s"' % cmd # work around spawn lamosity on windows
+
 ws = pkg_resources.working_set
 assert os.spawnle(
     os.P_WAIT, sys.executable, sys.executable,
-    '-c', 'from setuptools.command.easy_install import main; main()',
-    '-mqNxd', tmpeggs, 'zc.buildout',
-    {'PYTHONPATH':
-     ws.find(pkg_resources.Requirement.parse('setuptools')).location
-     },
+    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
+    dict(os.environ,
+         PYTHONPATH=
+         ws.find(pkg_resources.Requirement.parse('setuptools')).location
+         ),
     ) == 0
 
 ws.add_entry(tmpeggs)

Modified: zc.sharing/trunk/buildout.cfg
===================================================================
--- zc.sharing/trunk/buildout.cfg	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/buildout.cfg	2007-05-01 02:38:09 UTC (rev 74949)
@@ -7,7 +7,7 @@
 
 [zope3]
 recipe = zc.recipe.zope3checkout
-url = svn://svn.zope.org/repos/main/Zope3/branches/3.3
+url = svn://svn.zope.org/repos/main/Zope3/trunk
 
 [data]
 recipe = zc.recipe.filestorage

Modified: zc.sharing/trunk/setup.py
===================================================================
--- zc.sharing/trunk/setup.py	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/setup.py	2007-05-01 02:38:09 UTC (rev 74949)
@@ -2,7 +2,7 @@
 
 setup(
     name = "zc.sharing",
-    version = "1.1dev",
+    version = "1.2dev",
     author = "Zope Corporation",
     author_email = "zope3-dev#zope.org",
     description = "Zope 3 security policy",
@@ -19,8 +19,7 @@
        'zc.security',
        'zope.testing',
        'setuptools',
-       # XXX leaving out most of the zope 3 dependencies for now,
-       # since Zope 3 hasn't been packages yet.
+       # XXX leaving out most of the zope 3 dependencies for now: TODO
        ],
     dependency_links = ['http://download.zope.org/distribution/'],
     )

Added: zc.sharing/trunk/src/zc/sharing/CHANGES.txt
===================================================================
--- zc.sharing/trunk/src/zc/sharing/CHANGES.txt	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/src/zc/sharing/CHANGES.txt	2007-05-01 02:38:09 UTC (rev 74949)
@@ -0,0 +1,21 @@
+1.2
+===
+
+dev
+---
+
+Branch for Zope 3.4
+
+- Fix tests to incorporate improved Zope 3.4 behavior in 
+  zope.app.publication.zopepublication.ZopePublication.beforeTraverse
+  (now it looks up the global auth, and before it used an import).
+
+1.1
+===
+
+Branch for Zope 3.3
+
+1.0
+===
+
+Initial release


Property changes on: zc.sharing/trunk/src/zc/sharing/CHANGES.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: zc.sharing/trunk/src/zc/sharing/TODO.txt
===================================================================
--- zc.sharing/trunk/src/zc/sharing/TODO.txt	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/src/zc/sharing/TODO.txt	2007-05-01 02:38:09 UTC (rev 74949)
@@ -0,0 +1 @@
+- convert setup.py to use eggs; specify 3.4 eggs


Property changes on: zc.sharing/trunk/src/zc/sharing/TODO.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: zc.sharing/trunk/src/zc/sharing/browser/ftesting.zcml
===================================================================
--- zc.sharing/trunk/src/zc/sharing/browser/ftesting.zcml	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/src/zc/sharing/browser/ftesting.zcml	2007-05-01 02:38:09 UTC (rev 74949)
@@ -31,20 +31,6 @@
     title="Everybody" 
     />
 
-  <!-- Principal that tests generally run as -->
-  <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw" />
-
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
-      id="zope.globalmgr"
-      title="Manager"
-      login="globalmgr"
-      password="globalmgrpw" />
-
   <include package="zc.sharing" file="meta.zcml" />
   <include package="zc.sharing" />
 

Modified: zc.sharing/trunk/src/zc/sharing/browser/ntests.py
===================================================================
--- zc.sharing/trunk/src/zc/sharing/browser/ntests.py	2007-05-01 02:29:39 UTC (rev 74948)
+++ zc.sharing/trunk/src/zc/sharing/browser/ntests.py	2007-05-01 02:38:09 UTC (rev 74949)
@@ -50,12 +50,14 @@
                 Principal('2', 'bob'),
                 Principal('3', 'sally'),
                 Principal('zope.manager', 'manager'),
+                Principal('zope.mgr', 'super admin'),
                 Principal('zope.Authenticated', 'Everybody'),
                 ]
              ])
         
         self.byCred = {
             'jim:eek': self.byId['1'],
+            'mgr:mgrpw': self.byId['zope.mgr']
             }
 
     def searchUsers(self, filter, start, size):
@@ -72,6 +74,9 @@
     def getPrincipal(self, id):
         return self.byId.get(id)
 
+    def unauthenticatedPrincipal(self):
+        return None
+
 def formatterFactory(*args, **kw):
     return zc.table.table.FormFullFormatter(*args, **kw)
 interface.directlyProvides(formatterFactory,



More information about the Checkins mailing list