The py3k branch is the new trunk.

Author: wobsta

AUTHORS renamed to pyx/AUTHORS

@@ -1,4 +1,5 @@
-0.???? (201?/??/??):
+0.???? (2013/??/??):
+  - Requires at least Python 3.3 
   - filelocator module:
     - cygwin LaTeX with windows python patch (thanks to Sybren A. Stüvel)
   - graph styles:
@@ -19,6 +20,8 @@
   - trafos and styles are no longer canvasitems
   - style module:
     - fillrules are now fillstyles and handled within the PS/PDF context
+  - text module:
+    - new texenc setting (TODO documentation)
 
 0.12.1 (2012/10/26):
   - graph styles:

CHANGES renamed to pyx/CHANGES

@@ -17,16 +17,16 @@ def test_installation():
     except ImportError:
         compiled_pykpathsea = False
 
-    print "Platform is %s" % sys.platform
-    print "Python installation prefix is %s" % sys.prefix
-    print "Python executable is %s" % sys.executable
-    print "PyX comes from %s" % pyx.__file__
-    print "PyX version %s" % pyx.__version__
+    print("Platform is %s" % sys.platform)
+    print("Python installation prefix is %s" % sys.prefix)
+    print("Python executable is %s" % sys.executable)
+    print("PyX comes from %s" % pyx.__file__)
+    print("PyX version %s" % pyx.__version__)
     if compiled_pykpathsea:
-        print "PyX pykpathsea compiled from C module"
+        print("PyX pykpathsea compiled from C module")
     else:
-        print "PyX pykpathsea python module used"
-    print
+        print("PyX pykpathsea python module used")
+    print()
 
 def test_commands():
     for command in [r"echo $0 \"$*\"",
@@ -46,12 +46,12 @@ def test_commands():
                     r"file `which latex`",
                     ]:
         stdin, stdout, stderr = os.popen3(command)
-        print "\"%22s\" -->" % (command),
+        print("\"%22s\" -->" % (command), end=' ')
         for line in stdout:
-            print " %s" % line,
+            print(" %s" % line, end=' ')
         for x in [stdin, stdout, stderr]:
             x.close()
-    print
+    print()
 
 def test_fontmaps():
     allformats = []
@@ -131,10 +131,10 @@ def test_fontmaps():
             mappath = pyx.pykpathsea.find_file(fontmap, form)
             if mappath:
                 found = 1
-                print "\"%s\" found at \"%s\" as format \"%s\"" % (fontmap, mappath, allnames[form])
+                print("\"%s\" found at \"%s\" as format \"%s\"" % (fontmap, mappath, allnames[form]))
         if not found:
-            print "\"%s\" not found" % fontmap
-    print
+            print("\"%s\" not found" % fontmap)
+    print()
 
 test_installation()
 test_commands()

INSTALL renamed to pyx/INSTALL

@@ -22,11 +22,8 @@
 #       - this is much too slow --- consider a rewrite in C
 
 
-import getopt, sys, os, StringIO, re, math
-try:
-    from PIL import Image
-except ImportError:
-    import Image
+import getopt, sys, os, io, re, math
+from PIL import Image
 
 
 progname = "epstopng v0.1: eps to transparent antialiased png converter"
@@ -35,7 +32,7 @@
 def epstopng(epsname, pngname, resolution, scale, transparent, gsname, quiet):
     sys.stderr.write("run ghostscript to create a %i times larger non-antialiased image ... " % scale)
     gsout = os.popen("%s -dEPSCrop -dNOPAUSE -dQUIET -dBATCH -sDEVICE=ppmraw -sOutputFile=- -r%i %s" % (gsname, resolution*scale, epsname))
-    input = Image.open(StringIO.StringIO(gsout.read())).convert("RGB") # ensure rgb here
+    input = Image.open(io.StringIO(gsout.read())).convert("RGB") # ensure rgb here
     output = Image.new("RGBA", [(x+scale-1)/scale for x in input.size])
     sys.stderr.write("done\n")
     sys.stderr.write("image size is %ix%i\n" % output.size)
@@ -68,16 +65,16 @@ def epstopng(epsname, pngname, resolution, scale, transparent, gsname, quiet):
 
 
 def usage():
-    print progname
-    print "Copyright (C) 2003 André Wobst <[email protected]>"
-    print "usage: epstopng [options] <eps-file>"
-    print "-h, --help: show this help"
-    print "-q, --quiet: be quiet"
-    print "-o, --output <file>: output file name; must be set"
-    print "-r, --resolution <dpi>: resolution; default: 100"
-    print "-s, --scale <scale>: input scale for antialias; default: 4"
-    print "-t, --transparent (<r>, <g>, <b>): transparent color; default: (255, 255, 255)"
-    print "-g, --gsname <name>: name of the gs interpreter (gs version >= 8.0 needed!); default: \"gs\""
+    print(progname)
+    print("Copyright (C) 2003 André Wobst <[email protected]>")
+    print("usage: epstopng [options] <eps-file>")
+    print("-h, --help: show this help")
+    print("-q, --quiet: be quiet")
+    print("-o, --output <file>: output file name; must be set")
+    print("-r, --resolution <dpi>: resolution; default: 100")
+    print("-s, --scale <scale>: input scale for antialias; default: 4")
+    print("-t, --transparent (<r>, <g>, <b>): transparent color; default: (255, 255, 255)")
+    print("-g, --gsname <name>: name of the gs interpreter (gs version >= 8.0 needed!); default: \"gs\"")
 
 
 def main():

LICENSE renamed to pyx/LICENSE

@@ -37,10 +37,7 @@
 try:
     im = bitmap.jpegimage(args[0])
 except ValueError:
-    try:
-        from PIL import Image
-    except ImportError:
-        import Image
+    from PIL import Image
     im = Image.open(args[0])
     compressmode = "Flate"
 else:

MANIFEST.in renamed to pyx/MANIFEST.in

@@ -1,3 +1,3 @@
 from pyx import *
 p = path.circle(0, 0, 1)
-print p.arclen()
+print(p.arclen())

README renamed to pyx/README

@@ -1,8 +1,8 @@
 from pyx import *
 
-image_bw = bitmap.image(2, 2, "L", "\0\377\377\0")
-image_rgb = bitmap.image(3, 2, "RGB", "\77\77\77\177\177\177\277\277\277"
-                                      "\377\0\0\0\377\0\0\0\377")
+image_bw = bitmap.image(2, 2, "L", b"\0\377\377\0")
+image_rgb = bitmap.image(3, 2, "RGB", b"\77\77\77\177\177\177\277\277\277"
+                                      b"\377\0\0\0\377\0\0\0\377")
 bitmap_bw = bitmap.bitmap(0, 1, image_bw, height=0.8)
 bitmap_rgb = bitmap.bitmap(0, 0, image_rgb, height=0.8)
 

TODO renamed to pyx/TODO

@@ -1,10 +1,5 @@
 from pyx import *
-
-# support Image module either from PIL or pillow
-try:
-    from PIL import Image
-except ImportError:
-    import Image
+from PIL import Image
 
 im = Image.new("RGB", (3, 1))
 im.putpixel((0, 0), (255, 0, 0))

pyx/config.py

@@ -4,9 +4,9 @@
 
 g = graph.graphxy(width=8)
 # either provide lists of the individual coordinates
-g.plot(graph.data.values(x=range(10), y=range(10)))
+g.plot(graph.data.values(x=list(range(10)), y=list(range(10))))
 # or provide one list containing the whole points
-g.plot(graph.data.points(zip(range(10), range(10)), x=1, y=2))
+g.plot(graph.data.points(list(zip(list(range(10)), list(range(10)))), x=1, y=2))
 g.writeEPSfile("points")
 g.writePDFfile("points")
 

contrib/callingtex.py renamed to pyx/contrib/callingtex.py

@@ -42,8 +42,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'pyxfaq'
-copyright = u'2011, Gert-Ludwig Ingold'
+project = 'pyxfaq'
+copyright = '2011, Gert-Ludwig Ingold'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -182,8 +182,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'pyxfaq.tex', u'Some frequently and not so frequently asked questions about PyX',
-   u'Gert-Ludwig Ingold', 'manual'),
+  ('index', 'pyxfaq.tex', 'Some frequently and not so frequently asked questions about PyX',
+   'Gert-Ludwig Ingold', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -220,7 +220,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'pyxfaq', u'pyxfaq Documentation',
-     [u'Gert-Ludwig Ingold'], 1)
+    ('index', 'pyxfaq', 'pyxfaq Documentation',
+     ['Gert-Ludwig Ingold'], 1)
 ]