Merge remote-tracking branch 'upstream/develop' into develop

wonderg · Jan 1, 2015 · 96f65c6 · 96f65c6
2 parents 80e51fe + ed4611a
commit 96f65c6
Show file tree

Hide file tree

Showing 159 changed files with 2,605 additions and 6,503 deletions.
diff --git a/PyInstaller/__init__.py b/PyInstaller/__init__.py
@@ -21,6 +21,8 @@
 # Fail hard if Python does not have minimum required version
 if sys.version_info < (2, 4):
     raise SystemExit('PyInstaller requires at least Python 2.4, sorry.')
+elif sys.version_info >= (3,):
+    raise SystemExit('Python 3 is not yet supported, sorry.')
 
 
 # Extend PYTHONPATH with 3rd party libraries bundled with PyInstaller.