rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add python3 suppport based on 2to3 script

Browse source
This commit is contained in:
Stefan Klug 2015-10-27 21:10:24 +01:00
parent caef0e85d0
commit 4f91a30fec
68 changed files with 597 additions and 576 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gen/wrappers/ToolWrapper.py
View file

@ -424,7 +424,7 @@ class ToolWrapper(AbstractWrapper):
'<tr><th></th><th>%s</th></tr>' % \
self.translate('last_user_access')
rows = []
for userId, lastAccess in self.o.loggedUsers.items():
for userId, lastAccess in list(self.o.loggedUsers.items()):
user = self.search1('User', noSecurity=True, login=userId)
if not user: continue # Could have been deleted in the meanwhile
fmt = '%s (%s)' % (self.dateFormat, self.hourFormat)
@ -515,7 +515,7 @@ class ToolWrapper(AbstractWrapper):
failed += subFailed
try:
startObject.reindex()
except Exception, e:
except Exception as e:
failed.append(startObject)
return nb, failed

4
gen/wrappers/UserWrapper.py
View file

@ -343,7 +343,7 @@ class UserWrapper(AbstractWrapper):
if not localRoles: return res
# Gets the logins of this user and all its groups.
logins = self.getLogins()
for login, roles in localRoles.iteritems():
for login, roles in localRoles.items():
# Ignore logins not corresponding to this user.
if login not in logins: continue
for role in roles:
@ -388,7 +388,7 @@ class UserWrapper(AbstractWrapper):
if not localRoles: return
# Gets the logins of this user and all its groups.
userLogins = self.getLogins()
for login, roles in localRoles.iteritems():
for login, roles in localRoles.items():
# Ignore logins not corresponding to this user.
if login not in userLogins: continue
for role in roles:

14
gen/wrappers/__init__.py
View file

@ -861,7 +861,7 @@ class AbstractWrapper(object):
if len(self.__class__.__bases__) > 1:
# There is a custom user class
custom = self.__class__.__bases__[-1]
if custom.__dict__.has_key(methodName):
if methodName in custom.__dict__:
return custom.__dict__[methodName]
def _callCustom(self, methodName, *args, **kwargs):
@ -973,7 +973,7 @@ class AbstractWrapper(object):
present, will not be called; any other defined method will not be
called neither (ie, Ref.insert, Ref.beforeLink, Ref.afterLink...).
'''
isField = isinstance(fieldNameOrClass, basestring)
isField = isinstance(fieldNameOrClass, str)
tool = self.tool.o
# Determine the class of the object to create
if isField:
@ -984,7 +984,7 @@ class AbstractWrapper(object):
klass = fieldNameOrClass
portalType = tool.getPortalType(klass)
# Determine object id
if kwargs.has_key('id'):
if 'id' in kwargs:
objId = kwargs['id']
del kwargs['id']
else:
@ -1002,7 +1002,7 @@ class AbstractWrapper(object):
noSecurity=noSecurity)
appyObj = zopeObj.appy()
# Set object attributes
for attrName, attrValue in kwargs.iteritems():
for attrName, attrValue in kwargs.items():
try:
setattr(appyObj, attrName, attrValue)
except AttributeError, ae:
@ -1183,8 +1183,8 @@ class AbstractWrapper(object):
# Get the Appy object from the brain
if noSecurity: method = '_unrestrictedGetObject'
else: method = 'getObject'
exec 'obj = brain.%s().appy()' % method
exec expression
exec('obj = brain.%s().appy()' % method)
exec(expression)
return ctx
def reindex(self, fields=None, unindex=False):
@ -1249,7 +1249,7 @@ class AbstractWrapper(object):
else:
return xml
elif format == 'csv':
if isinstance(at, basestring):
if isinstance(at, str):
marshaller = CsvMarshaller(include=include, exclude=exclude)
return marshaller.marshall(self)
else: