[Zope3-checkins] CVS: Zope3/src/zope/app/security/registries - metadirectives.py:1.5 roleregistry.py:1.6

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/security/registries
In directory cvs.zope.org:/tmp/cvs-serv1651/src/zope/app/security/registries

Modified Files:
	metadirectives.py roleregistry.py 
Log Message:
I remember that we were too lazy after ZCMLgeddon to require the principal
and role ids to be Id fields, since it required many places to change. 

While I was writing on the devel cookbook, I saw the metadirectives for the 
security again and could not resist fixing it.

All tests pass now and Zope seems to run fine as well. 


=== Zope3/src/zope/app/security/registries/metadirectives.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/security/registries/metadirectives.py:1.4	Sun Aug 17 02:08:05 2003
+++ Zope3/src/zope/app/security/registries/metadirectives.py	Sun Dec 14 03:25:34 2003
@@ -22,7 +22,7 @@
 class IBaseDefineDirective(Interface):
     """Define a new security object."""
     
-    id = TextLine(
+    id = Id(
         title=u"Id",
         description=u"Id as which this object will be known and used.",
         required=True)
@@ -41,17 +41,12 @@
 class IDefinePermissionDirective(IBaseDefineDirective):
     """Define a new permission."""
 
-    id = Id(
-        title=u"Id",
-        description=u"Id as which this permission will be known and used.",
-        required=True)
-
 class IDefineRoleDirective(IBaseDefineDirective):
     """Define a new role."""
 
 class IBasePrincipalDirective(Interface):
     
-    id = TextLine(
+    id = Id(
         title=u"Id",
         description=u"Id as which this object will be known and used.",
         required=True)


=== Zope3/src/zope/app/security/registries/roleregistry.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/security/registries/roleregistry.py:1.5	Sat Jun  7 01:46:05 2003
+++ Zope3/src/zope/app/security/registries/roleregistry.py	Sun Dec 14 03:25:34 2003
@@ -70,7 +70,7 @@
     def _clear(self):
         # Standard roles
         Registry._clear(self)
-        self.register("Anonymous", "Everybody",
+        self.register("zope.Anonymous", "Everybody",
                       "All users have this role implicitly")
 
 roleRegistry = RoleRegistry()