[nik4] 04/10: Add patch for Python 3 support.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository nik4.

commit f0d8b151ed97b82cfc5ac796d9b42b14a5b61600
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 29 17:21:51 2016 +0200

    Add patch for Python 3 support.
---
 debian/patches/python3.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 2 files changed, 51 insertions(+)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
new file mode 100644
index 0000000..e9fe942
--- /dev/null
+++ b/debian/patches/python3.patch
@@ -0,0 +1,50 @@
+Description: Add support for Python 3.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/Zverik/Nik4/issues/23
+
+--- a/nik4.py
++++ b/nik4.py
+@@ -376,12 +376,12 @@ if __name__ == "__main__":
+ 		select_layers(m, options.add_layers.split(',') if options.add_layers else [], options.hide_layers.split(',') if options.hide_layers else [])
+ 
+ 	if options.debug:
+-		print 'scale={}'.format(scale)
+-		print 'scale_factor={}'.format(scale_factor)
+-		print 'size={},{}'.format(size[0], size[1])
+-		print 'bbox={}'.format(bbox)
+-		print 'bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None)
+-		print 'layers=' + ','.join([l.name for l in m.layers if l.active])
++		print('scale={}'.format(scale))
++		print('scale_factor={}'.format(scale_factor))
++		print('size={},{}'.format(size[0], size[1]))
++		print('bbox={}'.format(bbox))
++		print('bbox_wgs84={}'.format(transform.backward(bbox) if bbox else None))
++		print('layers=' + ','.join([l.name for l in m.layers if l.active]))
+ 
+ 	# generate metadata
+ 	if options.ozi:
+@@ -424,14 +424,14 @@ if __name__ == "__main__":
+ 			m.buffer_size = TILE_BUFFER
+ 			tile_cnt = [int(math.ceil(1.0 * size[0] / width)), int(math.ceil(1.0 * size[1] / height))]
+ 			if options.debug:
+-				print 'tile_count={},{}'.format(tile_cnt[0], tile_cnt[1])
+-				print 'tile_size={},{}'.format(width, height)
++				print('tile_count={},{}'.format(tile_cnt[0], tile_cnt[1]))
++				print('tile_size={},{}'.format(width, height))
+ 			tmp_tile = '{:02d}_{:02d}_{}'
+ 			tile_files = []
+ 			for row in range(0, tile_cnt[1]):
+ 				for column in range(0, tile_cnt[0]):
+ 					if options.debug:
+-						print 'tile={},{}'.format(row, column)
++						print('tile={},{}'.format(row, column))
+ 					tile_bbox = mapnik.Box2d(bbox.minx + 1.0 * width * scale * column, bbox.maxy - 1.0 * height * scale * row, bbox.minx + 1.0 * width * scale * (column + 1), bbox.maxy - 1.0 * height * scale * (row + 1))
+ 					tile_size = [width if column < tile_cnt[0] - 1 else size[0] - width * (tile_cnt[0] - 1), height if row < tile_cnt[1] - 1 else size[1] - height * (tile_cnt[1] - 1)]
+ 					m.zoom_to_box(tile_bbox)
+@@ -465,5 +465,5 @@ if __name__ == "__main__":
+ 			msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
+ 
+ 		outfile.seek(0)
+-		print outfile.read()
++		print(outfile.read())
+ 		outfile.close()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a2fba86
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+python3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nik4.git