From 07d60e7d5770ed487ff1224e06ea519afbad0b73 Mon Sep 17 00:00:00 2001
From: Hartmut Holzgraefe <hartmut@php.net>
Date: Thu, 1 Feb 2018 23:57:07 +0100
Subject: [PATCH] some more Python3 fixes that had gone unnoticed so far

---
 ocitysmap/indexlib/renderer.py               |  5 +++--
 ocitysmap/layoutlib/single_page_renderers.py | 12 ++++++------
 render.py                                    |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ocitysmap/indexlib/renderer.py b/ocitysmap/indexlib/renderer.py
index 31ed13f..2dfc189 100644
--- a/ocitysmap/indexlib/renderer.py
+++ b/ocitysmap/indexlib/renderer.py
@@ -170,7 +170,7 @@ class PoiIndexRenderer:
         marker_path = os.path.abspath(os.path.join(
             os.path.dirname(__file__), '..', '..', 'images', 'marker.svg'))
 
-        fp = open(marker_path,'rb')
+        fp = open(marker_path,'r')
         data = fp.read()
         fp.close()
 
@@ -180,7 +180,8 @@ class PoiIndexRenderer:
 
         data = data.replace('#000000', color)
 
-        svg = rsvg.Handle(data = data)
+        rsvg = Rsvg.Handle()
+        svg = rsvg.new_from_data(data.encode())
 
         scale = 50.0 / svg.props.height;
         x += 35
diff --git a/ocitysmap/layoutlib/single_page_renderers.py b/ocitysmap/layoutlib/single_page_renderers.py
index 764bd1e..f248445 100644
--- a/ocitysmap/layoutlib/single_page_renderers.py
+++ b/ocitysmap/layoutlib/single_page_renderers.py
@@ -410,9 +410,9 @@ class SinglePageRenderer(Renderer):
 
         ctx.save()
         pc = PangoCairo.create_context(ctx)
+        layout = PangoCairo.create_layout(ctx)
         fd = Pango.FontDescription('DejaVu')
         fd.set_size(Pango.SCALE)
-        layout = pc.create_layout()
         layout.set_font_description(fd)
         layout.set_text(notice, -1)
         draw_utils.adjust_font_size(layout, fd, w_dots, h_dots)
@@ -425,7 +425,7 @@ class SinglePageRenderer(Renderer):
         marker_path = os.path.abspath(os.path.join(
             os.path.dirname(__file__), '..', '..', 'images', 'marker.svg'))
 
-        fp = open(marker_path,'rb')
+        fp = open(marker_path,'r')
         data = fp.read()
         fp.close()
 
@@ -436,7 +436,7 @@ class SinglePageRenderer(Renderer):
         data = data.replace('#000000', color)
 
         rsvg = Rsvg.Handle()
-        svg = rsvg.new_from_data(data)
+        svg = rsvg.new_from_data(data.encode())
 
         x,y = self._latlon2xy(lat, lon, dpi)
 
@@ -452,14 +452,14 @@ class SinglePageRenderer(Renderer):
         svg.render_cairo(ctx)
 
         pc = PangoCairo.create_context(ctx)
+        layout = PangoCairo.create_layout(ctx)
         fd = Pango.FontDescription('Droid Sans')
         fd.set_size(Pango.SCALE)
-        layout = pc.create_layout()
         layout.set_font_description(fd)
         layout.set_text(txt, -1)
         draw_utils.adjust_font_size(layout, fd, svg.props.width/3, svg.props.width/3)
-        text_x, text_y, text_w, text_h = layout.get_extents()[1]
-        ctx.translate(svg.props.width/2 - text_w * scale/50, svg.props.height/5)
+        ink, logical = layout.get_extents()
+        ctx.translate(svg.props.width/2 - ink.width * scale/50, svg.props.height/5)
         PangoCairo.update_layout(ctx, layout)
         PangoCairo.show_layout(ctx, layout)
 
diff --git a/render.py b/render.py
index c5a2805..07ae69c 100755
--- a/render.py
+++ b/render.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8; mode: Python -*-
 
 # ocitysmap, city map and street index generator from OpenStreetMap data