Merge pull request #144 from dogodigi/master

Twee kleine fixes i.v.m. python 3 als standaard op mijn systeem
nlextract · Apr 17, 2015 · dccf7c2 · dccf7c2
2 parents 866df89 + faf3384
commit dccf7c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/bag/bin/bag-extract.sh b/bag/bin/bag-extract.sh
@@ -17,4 +17,10 @@ BASEDIR=`(cd "$BASEDIR"; pwd)`
 PY_SCRIPT=$BASEDIR/src/bagextract.py
 
 # uitvoeren Python script met alle meegegeven args
-python $PY_SCRIPT $@
+ret=`python -c 'import sys; print("%i" % (sys.hexversion<0x03000000))'`
+if [ $ret -eq 0 ]; then
+    #Python 3 is de standaard, roep python2 aan.
+    python2 $PY_SCRIPT $@
+else
+    python $PY_SCRIPT $@
+fi
diff --git a/bag/src/bagextract.py b/bag/src/bagextract.py
@@ -58,7 +58,7 @@ def confirm(prompt=None, resp=False):
         if not ans:
             return resp
         if ans not in ['j', 'J', 'n', 'N']:
-            print 'Geef j of n.'
+            print ('Geef j of n.')
             continue
         if ans == 'j' or ans == 'J':
             return True