Bringing branch up to date with dev

Merge branch 'development' into ErrorDialog_and_miscfixes

Conflicts:
	eos/saveddata/fit.py
	pyfa.py

eos/config.py

@@ -1,14 +1,25 @@
 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

eos/saveddata/module.py

@@ -173,7 +173,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                 charges = 0
             else:
                 charges = floor(containerCapacity / chargeVolume)
-        return charges
+        return int(charges)
 
     @property
     def numShots(self):