python2/3 compliancy

Author: yohanboniface

mapnik/__init__.py

@@ -61,17 +61,17 @@ def bootstrap_env():
         env = {'ICU_DATA':'/usr/local/share/icu/'}
     """
     if os.path.exists(os.path.join(os.path.dirname(__file__),'mapnik_settings.py')):
-        from mapnik_settings import env
+        from .mapnik_settings import env
         process_keys = os.environ.keys()
         for key, value in env.items():
             if key not in process_keys:
                 os.environ[key] = value
 
 bootstrap_env()
 
-from _mapnik import *
+from ._mapnik import *
 
-import printing
+from . import printing
 printing.renderer = render
 
 # The base Boost.Python class
@@ -1048,20 +1048,20 @@ def mapnik_version_from_string(version_string):
 def register_plugins(path=None):
     """Register plugins located by specified path"""
     if not path:
-        if os.environ.has_key('MAPNIK_INPUT_PLUGINS_DIRECTORY'):
+        if 'MAPNIK_INPUT_PLUGINS_DIRECTORY' in os.environ:
             path = os.environ.get('MAPNIK_INPUT_PLUGINS_DIRECTORY')
         else:
-            from paths import inputpluginspath
+            from .paths import inputpluginspath
             path = inputpluginspath
     DatasourceCache.register_datasources(path)
 
 def register_fonts(path=None,valid_extensions=['.ttf','.otf','.ttc','.pfa','.pfb','.ttc','.dfont','.woff']):
     """Recursively register fonts using path argument as base directory"""
     if not path:
-       if os.environ.has_key('MAPNIK_FONT_DIRECTORY'):
+       if 'MAPNIK_FONT_DIRECTORY' in os.environ:
            path = os.environ.get('MAPNIK_FONT_DIRECTORY')
        else:
-           from paths import fontscollectionpath
+           from .paths import fontscollectionpath
            path = fontscollectionpath
     for dirpath, _, filenames in os.walk(path):
         for filename in filenames:

mapnik/printing.py

@@ -15,7 +15,7 @@
 see the documentation of mapnik.printing.PDFPrinter() for options
 
 """
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 
 from . import render, Map, Box2d, Layer, Feature, Projection, Coord, Style, Geometry
 import math
@@ -393,7 +393,7 @@ def add_geospatial_pdf_header(self,m,filename,epsg=None,wkt=None):
             o=pyPdf.PdfFileWriter()
 
             # preserve OCProperties at document root if we have one
-            if i.trailer['/Root'].has_key(pyPdf.generic.NameObject('/OCProperties')):
+            if pyPdf.generic.NameObject('/OCProperties') in i.trailer['/Root']:
                 o._root.getObject()[pyPdf.generic.NameObject('/OCProperties')] = i.trailer['/Root'].getObject()[pyPdf.generic.NameObject('/OCProperties')]
 
             for p in i.pages:
@@ -911,7 +911,7 @@ def render_legend(self,m, page_break=False, ctx=None, collumns=1,width=None, hei
                                         else:
                                             rule_text += str(r.filter)
                         active_rules = tuple(active_rules)
-                        if added_styles.has_key(active_rules):
+                        if active_rules in added_styles:
                             continue
 
                         added_styles[active_rules] = (f,rule_text)
@@ -1014,7 +1014,7 @@ def render_legend(self,m, page_break=False, ctx=None, collumns=1,width=None, hei
                             e=self.write_text(ctx, rule_text, m2pt(cwidth-legend_item_box_size[0]-0.005), 6)
                             legend_text_size += e[3]
                             ctx.rel_move_to(0,e[3])
-                        if attribution.has_key(layer_title):
+                        if layer_title in attribution:
                             e=self.write_text(ctx, attribution[layer_title], m2pt(cwidth-legend_item_box_size[0]-0.005), 6, fill_color=(0.5,0.5,0.5))
                             legend_text_size += e[3]
 

setup.py

@@ -8,6 +8,18 @@
 import shutil
 import re
 
+PYTHON3 = sys.version_info[0] == 3
+
+
+# Utils
+def check_output(args):
+    output = subprocess.check_output(args)
+    if PYTHON3:
+        # check_output returns bytes in PYTHON3.
+        output = output.decode()
+    return output.rstrip('\n')
+
+
 cflags = sysconfig.get_config_var('CFLAGS')
 sysconfig._config_vars['CFLAGS'] = re.sub(' +', ' ', cflags.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
 opt = sysconfig.get_config_var('OPT')
@@ -35,13 +47,13 @@
 boost_thread_lib = os.environ.get("BOOST_THREAD_LIB", 'boost_thread-mt')
 
 try:
-    linkflags = subprocess.check_output([mapnik_config, '--libs']).rstrip('\n').split(' ')
+    linkflags = check_output([mapnik_config, '--libs']).split(' ')
     lib_path = linkflags[0][2:]
-    linkflags.extend(subprocess.check_output([mapnik_config, '--ldflags']).rstrip('\n').split(' '))
+    linkflags.extend(check_output([mapnik_config, '--ldflags']).split(' '))
 except:
-    raise Exception("Failed to find proper linking flags from mapnik config");
+    raise Exception("Failed to find proper linking flags from mapnik config")
 
-## Dynamically make the mapnik/paths.py file if it doesn't exist.
+# Dynamically make the mapnik/paths.py file if it doesn't exist.
 if os.path.isfile('mapnik/paths.py'):
     create_paths = False
 else:
@@ -60,7 +72,7 @@
         shutil.copyfile(f, os.path.join('mapnik', base_f))
     except shutil.Error:
         pass
-    input_plugin_path = subprocess.check_output([mapnik_config, '--input-plugins']).rstrip('\n')
+    input_plugin_path = check_output([mapnik_config, '--input-plugins'])
     input_plugin_files = os.listdir(input_plugin_path)
     input_plugin_files = [os.path.join(input_plugin_path, f) for f in input_plugin_files]
     if not os.path.exists(os.path.join('mapnik','plugins','input')):
@@ -70,7 +82,7 @@
             shutil.copyfile(f, os.path.join('mapnik', 'plugins', 'input', os.path.basename(f)))
         except shutil.Error:
             pass
-    font_path = subprocess.check_output([mapnik_config, '--fonts']).rstrip('\n')
+    font_path = check_output([mapnik_config, '--fonts'])
     font_files = os.listdir(font_path)
     font_files = [os.path.join(font_path, f) for f in font_files]
     if not os.path.exists(os.path.join('mapnik','plugins','fonts')):
@@ -94,7 +106,7 @@
 
 
 if not mason_build:
-    icu_path = subprocess.check_output([mapnik_config, '--icu-data']).rstrip('\n')
+    icu_path = check_output([mapnik_config, '--icu-data'])
 else:
     icu_path = 'mason_packages/.link/share/icu/'
 if icu_path:
@@ -109,7 +121,7 @@
             pass
 
 if not mason_build:
-    gdal_path = subprocess.check_output([mapnik_config, '--gdal-data']).rstrip('\n')
+    gdal_path = check_output([mapnik_config, '--gdal-data'])
 else:
     gdal_path = 'mason_packages/.link/share/gdal/'
     if os.path.exists('mason_packages/.link/share/gdal/gdal/'):
@@ -126,7 +138,7 @@
             pass
 
 if not mason_build:
-    proj_path = subprocess.check_output([mapnik_config, '--proj-lib']).rstrip('\n')
+    proj_path = check_output([mapnik_config, '--proj-lib'])
 else:
     proj_path = 'mason_packages/.link/share/proj/'
     if os.path.exists('mason_packages/.link/share/proj/proj/'):
@@ -142,7 +154,7 @@
         except shutil.Error:
             pass
 
-extra_comp_args = subprocess.check_output([mapnik_config, '--cflags']).rstrip('\n').split(' ')
+extra_comp_args = check_output([mapnik_config, '--cflags']).split(' ')
 
 if sys.platform == 'darwin':
     extra_comp_args.append('-mmacosx-version-min=10.8')
@@ -153,9 +165,9 @@
     linkflags.append('-Wl,-rpath=$ORIGIN')
 
 if os.environ.get("CC",False) == False:
-    os.environ["CC"] = subprocess.check_output([mapnik_config, '--cxx']).rstrip('\n')
+    os.environ["CC"] = check_output([mapnik_config, '--cxx'])
 if os.environ.get("CXX",False) == False:
-    os.environ["CXX"] = subprocess.check_output([mapnik_config, '--cxx']).rstrip('\n')
+    os.environ["CXX"] = check_output([mapnik_config, '--cxx'])
 
 setup(
     name = "mapnik",

test/python_tests/agg_rasterizer_integer_overflow_test.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from nose.tools import eq_
-from utilities import run_all
+from .utilities import run_all
 import mapnik
 import json
 

test/python_tests/box2d_test.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 from nose.tools import eq_,assert_true,assert_almost_equal,assert_false
-from utilities import run_all
+from .utilities import run_all
 import mapnik
 
 def test_coord_init():

test/python_tests/buffer_clear_test.py

@@ -1,6 +1,6 @@
 import os, mapnik
 from nose.tools import eq_
-from utilities import execution_path, run_all
+from .utilities import execution_path, run_all
 
 def setup():
     # All of the paths used are relative, if we run the tests

test/python_tests/cairo_test.py

@@ -1,10 +1,12 @@
 #!/usr/bin/env python
 
+from __future__ import print_function
+
 import os
 import shutil
 import mapnik
 from nose.tools import eq_
-from utilities import execution_path, run_all
+from .utilities import execution_path, run_all
 
 def setup():
     # All of the paths used are relative, if we run the tests
@@ -90,7 +92,7 @@ def test_passing_pycairo_context_svg():
         draw_neatline(m,context)
         surface.finish()
         if not os.path.exists(expected_cairo_file) or os.environ.get('UPDATE'):
-            print 'generated expected cairo surface file %s' % expected_cairo_file
+            print('generated expected cairo surface file', expected_cairo_file)
             shutil.copy(test_cairo_file,expected_cairo_file)
         diff = abs(os.stat(expected_cairo_file).st_size-os.stat(test_cairo_file).st_size)
         msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,test_cairo_file,'tests/python_tests/'+ expected_cairo_file)
@@ -109,7 +111,7 @@ def test_passing_pycairo_context_pdf():
         draw_neatline(m,context)
         surface.finish()
         if not os.path.exists(expected_cairo_file) or os.environ.get('UPDATE'):
-            print 'generated expected cairo surface file %s' % expected_cairo_file
+            print('generated expected cairo surface file', expected_cairo_file)
             shutil.copy(test_cairo_file,expected_cairo_file)
         diff = abs(os.stat(expected_cairo_file).st_size-os.stat(test_cairo_file).st_size)
         msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,test_cairo_file,'tests/python_tests/'+ expected_cairo_file)
@@ -133,14 +135,14 @@ def test_passing_pycairo_context_png():
         im.save(reduced_color_image,'png8')
         surface.finish()
         if not os.path.exists(expected_cairo_file) or os.environ.get('UPDATE'):
-            print 'generated expected cairo surface file %s' % expected_cairo_file
+            print('generated expected cairo surface file', expected_cairo_file)
             shutil.copy(test_cairo_file,expected_cairo_file)
         diff = abs(os.stat(expected_cairo_file).st_size-os.stat(test_cairo_file).st_size)
         msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,test_cairo_file,'tests/python_tests/'+ expected_cairo_file)
         eq_( diff < 500, True, msg)
         os.remove(test_cairo_file)
         if not os.path.exists(expected_cairo_file2) or os.environ.get('UPDATE'):
-            print 'generated expected cairo surface file %s' % expected_cairo_file2
+            print('generated expected cairo surface file', expected_cairo_file2)
             shutil.copy(reduced_color_image,expected_cairo_file2)
         diff = abs(os.stat(expected_cairo_file2).st_size-os.stat(reduced_color_image).st_size)
         msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,reduced_color_image,'tests/python_tests/'+ expected_cairo_file2)
@@ -159,7 +161,7 @@ def _pycairo_surface(type,sym):
                     mapnik.render(m, surface)
                     surface.finish()
                     if not os.path.exists(expected_cairo_file) or os.environ.get('UPDATE'):
-                        print 'generated expected cairo surface file %s' % expected_cairo_file
+                        print('generated expected cairo surface file', expected_cairo_file)
                         shutil.copy(test_cairo_file,expected_cairo_file)
                     diff = abs(os.stat(expected_cairo_file).st_size-os.stat(test_cairo_file).st_size)
                     msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff,test_cairo_file,'tests/python_tests/'+ expected_cairo_file)
@@ -170,7 +172,7 @@ def _pycairo_surface(type,sym):
                     os.remove(test_cairo_file)
                     return True
                 else:
-                    print 'skipping cairo.%s test since surface is not available' % type.upper()
+                    print('skipping cairo.%s test since surface is not available' % type.upper())
                     return True
 
         def test_pycairo_svg_surface1():

test/python_tests/color_test.py

@@ -5,7 +5,7 @@
 import os, mapnik
 from timeit import Timer, time
 from nose.tools import *
-from utilities import execution_path, run_all, get_unique_colors
+from .utilities import execution_path, run_all, get_unique_colors
 
 def setup():
     # All of the paths used are relative, if we run the tests

test/python_tests/compare_test.py

@@ -3,7 +3,7 @@
 
 import os, mapnik
 from nose.tools import *
-from utilities import execution_path, run_all
+from .utilities import execution_path, run_all
 
 def setup():
     # All of the paths used are relative, if we run the tests

test/python_tests/compositing_test.py

@@ -1,9 +1,11 @@
 #encoding: utf8
 
+from __future__ import print_function
+
 from nose.tools import eq_
 import os
-from utilities import execution_path, run_all
-from utilities import get_unique_colors, pixel2channels, side_by_side_image
+from .utilities import execution_path, run_all
+from .utilities import get_unique_colors, pixel2channels, side_by_side_image
 import mapnik
 
 def setup():
@@ -19,7 +21,7 @@ def debug_image(image,step=2):
         for y in range(0,image.height(),step):
             pixel = image.get_pixel(x,y)
             red,green,blue,alpha = pixel2channels(pixel)
-            print "rgba(%s,%s,%s,%s) at %s,%s" % (red,green,blue,alpha,x,y)
+            print("rgba(%s,%s,%s,%s) at %s,%s" % (red,green,blue,alpha,x,y))
 
 def replace_style(m, name, style):
     m.remove_style(name)
@@ -53,7 +55,7 @@ def validate_pixels_are_not_premultiplied2(image):
             #each value of the color channels will never be bigger than that of the alpha channel.
             if alpha > 0:
                 if red > 0 and red > alpha:
-                    print 'red: %s, a: %s' % (red,alpha)
+                    print('red: %s, a: %s' % (red,alpha))
                     looks_not_multiplied = True
     return looks_not_multiplied
 
@@ -94,7 +96,7 @@ def test_compare_images():
             fails.append('%s not validly demultiplied' % (name))
         a.save(actual,'png32')
         if not os.path.exists(expected) or os.environ.get('UPDATE'):
-            print 'generating expected test image: %s' % expected
+            print('generating expected test image: %s' % expected)
             a.save(expected,'png32')
         expected_im = mapnik.Image.open(expected)
         # compare them
@@ -168,7 +170,7 @@ def test_style_level_comp_op():
             expected = 'images/style-comp-op/' + name + '.png'
             im.save(actual,'png32')
             if not os.path.exists(expected) or os.environ.get('UPDATE'):
-                print 'generating expected test image: %s' % expected
+                print('generating expected test image: %s' % expected)
                 im.save(expected,'png32')
             expected_im = mapnik.Image.open(expected)
             # compare them