diff --git a/inst/loops/zshell.sh b/inst/loops/zshell.sh index c1c0473..dda6de1 100755 --- a/inst/loops/zshell.sh +++ b/inst/loops/zshell.sh @@ -2,7 +2,7 @@ set -a # use environment variables for instance-specific configuration: -#ZOPE_CONF=zope-1.conf +#SERVER_ID=0 #LOOPS_PATH=sites/mysite python -ic "from loops.server import psu; psu.setup()" diff --git a/loops/browser/util.py b/loops/browser/util.py index a0ed39a..51cffb5 100644 --- a/loops/browser/util.py +++ b/loops/browser/util.py @@ -3,7 +3,8 @@ """ Utilities. """ -import re, urllib +import re +import urllib.parse from zope.browserpage import ViewPageTemplateFile from zope.browsermenu.menu import BrowserMenu from zope.browsermenu.interfaces import IBrowserSubMenuItem @@ -51,4 +52,4 @@ def html_quote(text, character_entities=((u'&', u'&'), (u'<', u'<' ), pattern = re.compile(r'[ /\?\+\|%]') def normalizeForUrl(text): - return urllib.quote(pattern.sub('-', text).encode('UTF-8')) + return urllib.parse.quote(pattern.sub('-', text).encode('UTF-8')) diff --git a/loops/organize/presence.py b/loops/organize/presence.py index 71efc07..6216b06 100644 --- a/loops/organize/presence.py +++ b/loops/organize/presence.py @@ -31,7 +31,7 @@ class Presence(object): def removeInactiveUsers(self): toDelete = [] - for id, timeStamp in self.presentUsers.iteritems(): + for id, timeStamp in self.presentUsers.items(): if (getTimeStamp() - timeStamp) > (self.min_until_logout*60): toDelete.append(id) for id in toDelete: @@ -40,7 +40,7 @@ class Presence(object): def getPresentUsers(self, context=None): ret = [] - for id, timeStamp in self.presentUsers.iteritems(): + for id, timeStamp in self.presentUsers.items(): principal = util.getPrincipalForUserId(id) person = getPersonForUser(context, principal=principal) ret.append(person or principal) diff --git a/loops/resource.py b/loops/resource.py index 23b30d7..92aa0be 100644 --- a/loops/resource.py +++ b/loops/resource.py @@ -496,7 +496,7 @@ class DocumentReadFileAdapter(object): def read(self): data = self.data - if type(data) is unicode: + if type(data) is str: return self.data.encode('UTF-8') else: return data