[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ - removed unused variables
Yvo Schubbe
y.2009 at wcm-solutions.de
Tue Dec 8 16:31:03 EST 2009
Log message for revision 106310:
- removed unused variables
- indentation and other cleanup
Changed:
U Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
U Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py
U Products.CMFCore/trunk/Products/CMFCore/Skinnable.py
-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py 2009-12-08 21:28:52 UTC (rev 106309)
+++ Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py 2009-12-08 21:31:02 UTC (rev 106310)
@@ -339,7 +339,6 @@
DeprecationWarning, stacklevel=2)
if not self.isAnonymousUser():
- acl_users = self.acl_users
user = _getAuthenticatedUser(self)
name = user.getUserName()
# this really does need to be the user name, and not the user id,
@@ -423,7 +422,7 @@
if _checkPermission(ManageUsers, obj):
local_roles = self.getPortalRoles()
if 'Manager' not in member_roles:
- local_roles.remove('Manager')
+ local_roles.remove('Manager')
else:
local_roles = [ role for role in member_roles
if role not in ('Member', 'Authenticated') ]
@@ -515,7 +514,7 @@
# Delete members' home folders including all content items.
if delete_memberareas:
for member_id in member_ids:
- self.deleteMemberArea(member_id)
+ self.deleteMemberArea(member_id)
# Delete members' local roles.
if delete_localroles:
Modified: Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py 2009-12-08 21:28:52 UTC (rev 106309)
+++ Products.CMFCore/trunk/Products/CMFCore/PortalFolder.py 2009-12-08 21:31:02 UTC (rev 106310)
@@ -368,7 +368,6 @@
meta_types = getattr(self, 'all_meta_types', None)
if mt is not None and meta_types is not None:
- method_name = None
mt_permission = None
if callable(meta_types):
@@ -376,7 +375,6 @@
for d in meta_types:
if d['name'] == mt:
- method_name = d['action']
mt_permission = d.get('permission')
break
Modified: Products.CMFCore/trunk/Products/CMFCore/Skinnable.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/Skinnable.py 2009-12-08 21:28:52 UTC (rev 106309)
+++ Products.CMFCore/trunk/Products/CMFCore/Skinnable.py 2009-12-08 21:31:02 UTC (rev 106310)
@@ -93,12 +93,12 @@
if sfn is not None:
sf = getattr(self, sfn, None)
if sf is not None:
- if name is not None:
- skinob = sf.getSkinByName(name)
- if skinob is None:
- skinob = sf.getSkinByName(sf.getDefaultSkin())
- if skinob is None:
- skinob = sf.getSkinByPath('')
+ if name is not None:
+ skinob = sf.getSkinByName(name)
+ if skinob is None:
+ skinob = sf.getSkinByName(sf.getDefaultSkin())
+ if skinob is None:
+ skinob = sf.getSkinByPath('')
return skinob
security.declarePublic('getSkinNameFromRequest')
More information about the checkins
mailing list