Merge lp:~gcrosswhite/leo-editor/ran-setup-through-2to3 into lp:leo-editor/old-trunk

[Gregory Crosswhite]

I ran setup.py through 2to3 to get it working with Python 3. I checked that it still works with python2.5 and python2.6, so I would recommend accepting this patch since it makes Leo installable out-of-the-box with Python 3 without breaking backwards compatability.

Unmerged revisions

4297. By Gregory Crosswhite on 2011-06-07

Ran setup.py through 2to3 to make it compatible with Python 3.

I also checked it with python2.5 and python2.6 and it works just fine,
so this change does not seem to break backwards compatability at all.

=== modified file 'setup.py'
--- setup.py	2010-05-25 19:40:43 +0000
+++ setup.py	2011-06-07 20:19:51 +0000
@@ -42,7 +42,7 @@
 # Tell distutils to put the data_files in platform-specific installation
 # locations. See here for an explanation:
 # http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
-for scheme in INSTALL_SCHEMES.values():
+for scheme in list(INSTALL_SCHEMES.values()):
     scheme['data'] = scheme['purelib']
 #@+node:ville.20090213233714.2:@url http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
 #@-node:ville.20090213233714.2:@url http://groups.google.com/group/comp.lang.python/browse_thread/thread/35ec7b2fed36eaec/2105ee4d9e8042cb
@@ -71,9 +71,9 @@
             data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
 
 import pprint
-print "data files"
+print("data files")
 pprint.pprint(data_files)
-print "packages (pre-cleanup)"
+print("packages (pre-cleanup)")
 pprint.pprint(packages)
 
 #cleanup unwanted packages
@@ -81,7 +81,7 @@
 # extensions should be provided through repos (packaging)
 packages = [pa for pa in packages if not pa.startswith('leo.extensions')]
 
-print "packages (post-cleanup)"
+print("packages (post-cleanup)")
 pprint.pprint(packages)
 
 #cleanup unwanted data files