[Zope-Checkins] CVS: Zope/lib/python/AccessControl - User.py:1.159

[Martijn Pieters]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv8573

Modified Files:
	User.py 
Log Message:
Added deprecation warnings fro User.hasRole.


=== Zope/lib/python/AccessControl/User.py 1.158 => 1.159 ===
         return None
 
-    hasRole=allowed
+    def hasRole(self, *args, **kw):
+        """hasRole is an alias for 'allowed' and has been deprecated.
+        
+        Code still using this method should convert to either 'has_role' or
+        'allowed', depending on the intended behaviour.
+
+        """
+        import warnings
+        warnings.warn('BasicUser.hasRole is deprecated, please use '
+            'BasicUser.allowed instead; hasRole was an alias for allowed, but '
+            'you may have ment to use has_role.', DeprecationWarning)
+        self.allowed(*args, **kw)
+
     domains=[]
     
     def has_role(self, roles, object=None):
@@ -372,7 +384,19 @@
     def allowed(self,parent,roles=None):
         return roles is not _what_not_even_god_should_do
 
-    hasRole=allowed
+    def hasRole(self, *args, **kw):
+        """hasRole is an alias for 'allowed' and has been deprecated.
+        
+        Code still using this method should convert to either 'has_role' or
+        'allowed', depending on the intended behaviour.
+
+        """
+        import warnings
+        warnings.warn('UnrestrictedUser.hasRole is deprecated, please use '
+            'UnrestrictedUser.allowed instead; hasRole was an alias for '
+            'allowed, but you may have ment to use has_role.',
+            DeprecationWarning)
+        self.allowed(*args, **kw)
 
     def has_role(self, roles, object=None): return 1
 
@@ -412,7 +436,19 @@
     def allowed(self, parent, roles=None):
         return 0
 
-    hasRole=allowed
+    def hasRole(self, *args, **kw):
+        """hasRole is an alias for 'allowed' and has been deprecated.
+        
+        Code still using this method should convert to either 'has_role' or
+        'allowed', depending on the intended behaviour.
+
+        """
+        import warnings
+        warnings.warn('NullUnrestrictedUser.hasRole is deprecated, please use '
+            'NullUnrestrictedUser.allowed instead; hasRole was an alias for '
+            'allowed, but you may have ment to use has_role.',
+            DeprecationWarning)
+        self.allowed(*args, **kw)
 
     def has_role(self, roles, object=None):
         return 0