Merge branch 'jreiser-python3a' into jreiser-python3

src/stub/scripts/brandelf.py

@@ -65,7 +65,6 @@ def do_file(fn):
             raise Exception("%s is not %s" % (fn, opts.bfdname))
         write("\x09")
     def brand_linux(s):
-        print ("brand_linux ", s.encode(), "e_ident ", e_ident[4:7])
         if e_ident[4:7] != s.encode():
             raise Exception("%s is not %s" % (fn, opts.bfdname))
         ##write("\x00Linux\x00\x00\x00")

src/stub/scripts/gpp_inc.py

@@ -93,7 +93,7 @@ def handle_inc_c(state, l, ofp):
     elif q1 == '"' and q2 == '"':
         dirs = [state[1]] + opts.includes
     else:
-        raise Exception("syntax error: include line " + l)
+        raise Exception("syntax error: include line " + l.decode())
     for dir in dirs:
         fn = os.path.join(dir, inc)
         if os.path.isfile(fn):