Merge branch 'master' into updates

eyeonus · Jan 28, 2015 · ca2eb3b · ca2eb3b
2 parents 4285477 + 7259526
commit ca2eb3b
Show file tree

Hide file tree

Showing 8 changed files with 573 additions and 121 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,12 @@
 TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
+v6.8.2 Jan 27 2015
+. (kfsone) Issue #148 Don't blow up horribly when tkinter is missing,
+. (kfsone) Issue #149 "nav" with --via was broken,
+. (kfsone) Typo correction in the maddavo splash (thanks, Stefan),
++ Stations: Stefan Morrell, Dave Ryalls, Jason Zions
+
 v6.8.1 Jan 25 2015
 . (kfsone) Additional rules to prevent data pollution (ocr derp protection),
 . (kfsone) Support for maddavo's "3 hour" prices file,

diff --git a/cache.py b/cache.py
@@ -158,7 +158,15 @@
     LANOER |
     G[O0][O0]([RW]|VV)[O0I]N |
     \bSPE([O0][DO0]|[DO0][O0])ING\b |
-    \bARCHIMEOES\b
+    \bARCHIMEOES\b |
+    \bH[O0D]L[O0]ING |
+    \bM[O0D]HMAN[O0] |
+    \b[O0]ANA\b |
+    \bALEKSAN[O0]R[O0D]V\b |
+    \bCH[0D]MSKY\b |
+    \b[O0]IESEL\b |
+    [O0]{3} |
+    SCHMI[O0]T
 )''', flags=re.X)
 
 

diff --git a/commands/import_cmd.py b/commands/import_cmd.py
@@ -8,10 +8,15 @@
 import math
 import plugins
 import re
-import tkinter
-import tkinter.filedialog as tkfd
 import transfers
 
+try:
+    import tkinter
+    import tkinter.filedialog as tkfd
+    hasTkInter = True
+except ImportError:
+    hasTkInter = False
+
 ######################################################################
 # Parser config
 
@@ -106,7 +111,7 @@ def run(results, cmdenv, tdb):
 
     # If the filename specified was "-" or None, then go ahead
     # and present the user with an open file dialog.
-    if not cmdenv.filename:
+    if not cmdenv.filename and hasTkInter:
         tk = tkinter.Tk()
         tk.withdraw()
         filetypes = (

diff --git a/commands/nav_cmd.py b/commands/nav_cmd.py
@@ -68,9 +68,9 @@ def run(results, cmdenv, tdb):
     hops = [ [ srcSystem, None ] ]
     if cmdenv.viaPlaces:
         for hop in cmdenv.viaPlaces:
-            hops[0][1] = hop
-            hops.insert(0, [hop, None])
-    hops[0][1] = dstSystem
+            hops[-1][1] = hop
+            hops.append([hop, None])
+    hops[-1][1] = dstSystem
 
     avoiding = [
         avoid for avoid in cmdenv.avoidPlaces