Merge branch 'stable' into development

cool-RR · cool-RR · commit 616deb1b63db · 2011-09-28T14:20:46.000+02:00
diff --git a/garlicsim/garlicsim/bootstrap/bootstrap.py b/garlicsim/garlicsim/bootstrap/bootstrap.py
@@ -22,6 +22,7 @@
 
 
 frozen = getattr(sys, 'frozen', None)
+is_pypy = ('__pypy__' in sys.builtin_module_names)
 
 
 def __check_prerequisites():
@@ -69,7 +70,7 @@ def check_distribute():
             return []
         
     def check_pywin32():
-        if not sys.platform == 'win32':
+        if not sys.platform == 'win32' or is_pypy: # todo: should check CPython
             return []
         try:
             import win32api
diff --git a/run_gui.py b/run_gui.py
@@ -5,7 +5,7 @@
 
 '''A little module to start the `garlicsim_wx` GUI without installing it.'''
 
-import sys 
+import sys
 import os.path
 
 
@@ -40,4 +40,4 @@ def start():
     
 
 if __name__ == '__main__':
-    start()
+    start()
