Merge pull request #15 from sp35/master

Port genicons.py to Python3 from Python2

Author: TimidRobot

README.md

@@ -17,10 +17,10 @@ located at [`scripts/genicons.py`](scripts/genicons.py).
 ### Install
 
 1. Assuming the repository is on Debian
-2. Install required Python 2 packages:
+2. Install Python 3 and required Python 3 packages:
 
     ```shell
-    sudo apt-get install python-cairo python-gtk2
+    sudo apt-get install gir1.2-pango-1.0 python3-gi-cairo
     ```
 
 3. Install CC Icons font
@@ -33,10 +33,10 @@ located at [`scripts/genicons.py`](scripts/genicons.py).
 
 ### Usage
 
-Execute with Python 2:
+Execute with Python 3:
 
 ```shell
-python genicons.py
+python3 scripts/genicons.py
 ```
 
 This will generate the icons in the directory `www/i` directory.

scripts/genicons.py

@@ -9,7 +9,10 @@
 
 # Third-party
 import cairo
-import pangocairo
+import gi
+gi.require_version('PangoCairo', '1.0')
+from gi.repository import PangoCairo as pangocairo
+from functools import reduce
 
 
 SUITES = {
@@ -79,8 +82,7 @@ def show_chars(ctx, chars, foreground, padding, width, height):
 
 def create_context(width, height):
     surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height)
-    context = cairo.Context(surface)
-    ctx = pangocairo.CairoContext(context)
+    ctx = cairo.Context(surface)
     return ctx
 
 
@@ -128,7 +130,7 @@ def genicon(
     return ctx
 
 
-font_map = pangocairo.cairo_font_map_get_default()
+font_map = pangocairo.font_map_get_default()
 font_families = [family.get_name() for family in font_map.list_families()]
 if "CC Icons" not in font_families:
     raise Exception(
@@ -139,10 +141,10 @@ def genicon(
 basedir = os.path.realpath(
     os.path.abspath(os.path.join(script_dir, "..", "www", "i"))
 )
-print "# basedir:", basedir
+print("# basedir:", basedir)
 
-for suite, licenses in SUITES.iteritems():
-    for lic, module_chars in licenses.iteritems():
+for suite, licenses in SUITES.items():
+    for lic, module_chars in licenses.items():
         for chars in module_chars:
             for dimensions in DIMENSIONS:
                 for background in BACKGROUNDS: