Migrate from forward-incompatible iterator methods

Author: bgilbert

examples/deepzoom/deepzoom_server.py

@@ -47,14 +47,14 @@ def load_slide():
         'DEEPZOOM_TILE_SIZE': 'tile_size',
         'DEEPZOOM_OVERLAP': 'overlap',
     }
-    opts = dict((v, app.config[k]) for k, v in config_map.iteritems())
+    opts = dict((v, app.config[k]) for k, v in config_map.items())
     slide = open_slide(slidefile)
     app.slides = {
         SLIDE_NAME: DeepZoomGenerator(slide, **opts)
     }
     app.associated_images = []
     app.slide_properties = slide.properties
-    for name, image in slide.associated_images.iteritems():
+    for name, image in slide.associated_images.items():
         app.associated_images.append(name)
         slug = slugify(name)
         app.slides[slug] = DeepZoomGenerator(ImageSlide(image), **opts)

examples/deepzoom/deepzoom_tile.py

@@ -88,13 +88,13 @@ def run(self):
         self._write_dzi()
 
     def _write_tiles(self):
-        for level in xrange(self._dz.level_count):
+        for level in range(self._dz.level_count):
             tiledir = os.path.join("%s_files" % self._basename, str(level))
             if not os.path.exists(tiledir):
                 os.makedirs(tiledir)
             cols, rows = self._dz.level_tiles[level]
-            for row in xrange(rows):
-                for col in xrange(cols):
+            for row in range(rows):
+                for col in range(cols):
                     tilename = os.path.join(tiledir, '%d_%d.%s' % (
                                     col, row, self._format))
                     if not os.path.exists(tilename):

openslide/deepzoom.py

@@ -72,7 +72,7 @@ def __init__(self, osr, tile_size=256, overlap=1):
 
         # Total downsamples for each Deep Zoom level
         l0_z_downsamples = tuple(2 ** (self._dz_levels - dz_level - 1)
-                    for dz_level in xrange(self._dz_levels))
+                    for dz_level in range(self._dz_levels))
 
         # Preferred slide levels for each Deep Zoom level
         self._slide_from_dz_level = tuple(