[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kajongg] src: Windows: if kajongg.py is directly started, assume that python has version 3
From:       Wolfgang Rohdewald <wolfgang () rohdewald ! de>
Date:       2016-12-03 9:17:40
Message-ID: E1cD6Rw-0002UT-T4 () code ! kde ! org
[Download RAW message or body]

Git commit f8a1fb6305bdb028aba3cfa51c5cadf9ee6a781f by Wolfgang Rohdewald.
Committed on 03/12/2016 at 09:16.
Pushed by wrohdewald into branch 'master'.

Windows: if kajongg.py is directly started, assume that python has version 3

M  +6    -4    src/common.py

https://commits.kde.org/kajongg/f8a1fb6305bdb028aba3cfa51c5cadf9ee6a781f

diff --git a/src/common.py b/src/common.py
index 2b35317..699725a 100644
--- a/src/common.py
+++ b/src/common.py
@@ -51,11 +51,13 @@ else:
     bytes = str
     long = long
     isPython3 = False
-    if os.name == 'nt':
-        interpreterName = 'python'
-    else:
-        interpreterName = 'python2'
+    interpreterName = 'python2'
     xrange = xrange
+if os.name == 'nt':
+    # This is only needed for manual execution, and
+    # we expect python to be the python3 interpreter.
+    # The windows installer will use kajongg.exe and kajonggserver.exe
+    interpreterName = 'python'
 
 LIGHTSOURCES = [u'NE', u'NW', u'SW', u'SE']
 ENGLISHDICT = {}

[prev in list] [next in list] [prev in thread] [next in thread]