Merge pull request jordansissel#212 from Slezhuk/master

Fixed python3 incopabilities.
MITx · May 7, 2012 · 82e6b01 · 82e6b01
2 parents 6b1615a + 9d8def1
commit 82e6b01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/fpm/package/pyfpm/get_metadata.py b/lib/fpm/package/pyfpm/get_metadata.py
@@ -65,9 +65,9 @@ def run(self):
 
     #print json.dumps(data, indent=2)
     try:
-      print json.dumps(data, indent=2)
-    except AttributeError, e:
+      print(json.dumps(data, indent=2))
+    except AttributeError as e:
       # For Python 2.5 and Debian's python-json
-      print json.write(data)
+      print(json.write(data))
   # def run
 # class list_dependencies
diff --git a/lib/fpm/package/python.rb b/lib/fpm/package/python.rb
@@ -183,7 +183,7 @@ def install_to_staging(setup_py)
       # Ask python where libraries are installed to.
       # This line is unusually long because I don't have a shorter way to express it.
       attributes[:python_install_lib] = %x{
-        #{attributes[:python_bin]} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()'
+        #{attributes[:python_bin]} -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'
       }.chomp
       @logger.info("Setting default :python_install_lib attribute",
                    :value => attributes[:python_install_lib])