Use template strings rather than dodgy concatenation.

Map.py

@@ -32,21 +32,21 @@ def __init__(self, mapdict):
         itemfilepath = os.path.join('map', mapdict['dir'], mapdict['itemfile'])
         for filepath in terrainfilepath, itemfilepath:
             if not os.path.isfile(filepath):
-                raise Exception(filepath+" is not a file")
+                raise Exception("%s is not a file" %filepath)
 
         groundimage = pygame.image.load(terrainfilepath).convert()
         groundarray = pygame.surfarray.pixels2d(groundimage)
         wronggroundcolours = numpy.setdiff1d(groundarray, terrain.colorlist(groundimage))
         if wronggroundcolours.size:
             print wronggroundcolours
-            raise Exception("Unexpected value in "+terrainfilepath)
+            raise Exception("Unexpected value in %s" %terrainfilepath)
         collectablesimage = pygame.image.load(itemfilepath).convert()
         collectablesarray = pygame.surfarray.pixels2d(collectablesimage)
         collectablescolorsflat = pygame.surfarray.map_array(collectablesimage, numpy.array(collectables.mapcolor.keys()))
         wrongcollectablecolors = numpy.setdiff1d(collectablesarray, collectablescolorsflat)
         if wrongcollectablecolors.size:
             print wrongcollectablecolors
-            raise Exception("Unexpected value in "+itemfilepath)
+            raise Exception("Unexpected value in %s" %itemfilepath)
         self.size = groundimage.get_rect().size
 
         nbrcount = numpy.zeros(self.size, dtype=numpy.uint)

config.py

@@ -9,16 +9,17 @@
 
 def get(section, name, valuetype, default=None):
     try:
+        value = mainconfig.get(section, name)
         if valuetype is bool:
             # ConfigParser.getboolean() does useful string parsing.
             return mainconfig.getboolean(section, name)
         else:
-            return valuetype(mainconfig.get(section, name))
+            return valuetype(value)
     except ValueError:
         if default is None:
             raise
         else:
-            print "Warning: invalid value for ["+section+"] '"+name+"'"
+            print "Warning: invalid value '%s' for [%s], %s" %(value, section, name)
     except ConfigParser.Error:
         if default is None:
             raise

images.py

@@ -44,7 +44,7 @@ def dirsprites(image):
     if not os.path.isdir(os.path.join('tiles', 'terrain', name)):
         continue
     if not (name in terrain.types['groundimage'] or name in terrain.types['topimage']):
-        print "Warning: terrain sprites", name, "not used"
+        print "Warning: terrain sprites %s not used" %name
     terraingroups[name] = []
     for filename in os.listdir(os.path.join('tiles', 'terrain', name)):
         filepath = os.path.join('tiles', 'terrain', name, filename)
@@ -53,7 +53,7 @@ def dirsprites(image):
         loadedimage = pygame.image.load(filepath).convert()
         numtiles = float(loadedimage.get_width())/loadedimage.get_height()
         if numtiles not in [1, 6]:
-            print "Warning: sprite", filepath, "has invalid size"
+            print "Warning: sprite %s has invalid size" %filepath
             continue
         if numtiles == 1:
             loadedimage.set_colorkey(MAGENTA, pygame.RLEACCEL)

worlds.py

@@ -10,13 +10,13 @@
     try:
         imfile = open(descfilename)
     except:
-        print "Unable to load map", name+":"
-        print "File", descfilename, "unreadable or missing"
+        print "Unable to load map %s name:" %name
+        print "File %s unreadable or missing" %descfilename
         continue
     try:
         newmap = json.load(imfile)
     except ValueError as err:
-        print "Unable to load map", name+":"
+        print "Unable to load map %s:" %name
         print err
         continue
     imfile.close()