diff piecrust/uriutil.py @ 5:474c9882decf

Upgrade to Python 3.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 11 Aug 2014 22:36:47 -0700
parents f485ba500df3
children f5ca5c5bed85
line wrap: on
line diff
--- a/piecrust/uriutil.py	Mon Aug 11 22:36:36 2014 -0700
+++ b/piecrust/uriutil.py	Mon Aug 11 22:36:47 2014 -0700
@@ -49,7 +49,7 @@
 
     uri = '/' + uri.strip('/')
 
-    for rn, rc in routes.iteritems():
+    for rn, rc in routes.items():
         pattern = route_to_pattern(rn)
         m = re.match(pattern, uri)
         if m is not None:
@@ -68,7 +68,7 @@
 
 
 def multi_replace(text, replacements):
-    reps = dict((re.escape(k), v) for k, v in replacements.iteritems())
-    pattern = re.compile("|".join(reps.keys()))
+    reps = dict((re.escape(k), v) for k, v in replacements.items())
+    pattern = re.compile("|".join(list(reps.keys())))
     return pattern.sub(lambda m: reps[re.escape(m.group(0))], text)