Merge branch 'fix_unread_description' of git://github.com/jeffy-g/Pyfa-dev into jeffy-g-fix_unread_description

eos/config.py

@@ -1,17 +1,29 @@
 import sys
 from os.path import realpath, join, dirname, abspath
 
+from logbook import Logger
+import os
+
+istravis = os.environ.get('TRAVIS') == 'true'
+pyfalog = Logger(__name__)
+
 debug = False
 gamedataCache = True
 saveddataCache = True
 gamedata_version = ""
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")),
-                                                   sys.getfilesystemencoding())
-saveddata_connectionstring = 'sqlite:///' + unicode(
-    realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
+pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
+
+if istravis is True or hasattr(sys, '_called_from_test'):
+    # Running in Travis. Run saveddata database in memory.
+    saveddata_connectionstring = 'sqlite:///:memory:'
+else:
+    saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+
+pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)
 
 settings = {
-    "setting1": True
+    "useStaticAdaptiveArmorHardener": False
 }
 
 # Autodetect path, only change if the autodetection bugs out.

eos/saveddata/ship.py

@@ -71,6 +71,11 @@ class Ship(ItemAttrShortcut, HandledItem):
     def item(self):
         return self.__item
 
+    @property
+    def name(self):
+        # NOTE: add name property
+        return self.__item.name
+
     @property
     def itemModifiedAttributes(self):
         return self.__itemModifiedAttributes