python 3 fixes

davidmalcolm · davidmalcolm · commit 4254ccbaa680 · 2014-09-30T15:19:21.000-04:00
diff --git a/Makefile b/Makefile
@@ -95,7 +95,7 @@ PYTHON_CONFIG=python-config
 #PYTHON_CONFIG=python-debug-config
 
 #PYTHON=python3-debug
-#PYTHON_CONFIG=python3.2dmu-config
+#PYTHON_CONFIG=python3.3dm-config
 
 PYTHON_INCLUDES=$(shell $(PYTHON_CONFIG) --includes)
 PYTHON_LIBS=$(shell $(PYTHON_CONFIG) --libs)
diff --git a/gcc-python-plugin.spec b/gcc-python-plugin.spec
@@ -1,5 +1,5 @@
 Name:           gcc-python-plugin
-Version:        0.12
+Version:        0.13
 Release:        1%{?dist}
 Summary:        GCC plugin that embeds Python
 
@@ -177,7 +177,7 @@ BuildPlugin \
 
 BuildPlugin \
   python3-debug \
-  python3.2dmu-config \
+  python3.3dm-config \
   python3_debug.so \
   python3_debug
 
@@ -236,7 +236,7 @@ InstallPlugin \
 
 InstallPlugin \
   python3-debug \
-  python3.2dmu-config \
+  python3.3dm-config \
   python3_debug.so \
   python3_debug
 
@@ -322,7 +322,7 @@ CheckPlugin \
 #   (shares the issues of the above)
 CheckPlugin \
   python3-debug \
-  python3.2dmu-config \
+  python3.3dm-config \
   python3_debug.so \
   python3_debug \
   "-x tests/cpychecker"
diff --git a/gccutils/graph/stmtgraph.py b/gccutils/graph/stmtgraph.py
@@ -182,6 +182,9 @@ def __str__(self):
     def __repr__(self):
         return 'StmtNode(%r)' % self.stmt
 
+    def __hash__(self):
+        return hash(self.stmt)
+
     def get_stmt(self):
         return self.stmt
 
diff --git a/libcpychecker_html/make_html.py b/libcpychecker_html/make_html.py
@@ -27,7 +27,7 @@
 from os.path import realpath, dirname, join
 HERE = dirname(realpath(__file__))
 
-import capi
+from . import capi
 
 from lxml.html import (
     tostring, fragment_fromstring as parse, builder as E
@@ -37,6 +37,7 @@
 from pygments.lexers.compiled import CLexer
 from pygments.formatters.html import HtmlFormatter
 
+import base64
 from copy import deepcopy
 from itertools import islice
 
@@ -58,7 +59,7 @@ def __init__(self, codefile, data):
 
     def __str__(self):
         html = tostring(self.__html__())
-        return '<!DOCTYPE html>\n' + html
+        return '<!DOCTYPE html>\n' + html.decode('utf-8')
 
     def __html__(self):
         return E.HTML(self.head(), self.body())
@@ -271,8 +272,9 @@ def body(self):
 def data_uri(mimetype, filename):
     """represent a file as a data uri"""
     data = open(join(HERE, filename), 'rb').read()
-    data = data.encode('base64').replace('\n', '')
-    return 'data:%s;base64,%s' % (mimetype, data)
+    data = base64.encodestring(data)
+    data = data.replace(b'\n', b'')
+    return 'data:%s;base64,%s' % (mimetype, data.decode('ascii'))
 
 
 def file_contents(filename):
