Fix a couple typos in rarely used code branches.

Author: GraylinKim

sc2reader/factories.py

@@ -157,6 +157,7 @@ def load_resource(self, resource, options=None, **new_options):
                 directory = options.get('directory','')
                 location = os.path.join(directory, resource)
 
+                # Extract the contents so we can close the file
                 with open(location, 'rb') as resource_file:
                     contents = resource_file.read()
 
@@ -168,11 +169,9 @@ def load_resource(self, resource, options=None, **new_options):
             # Totally not designed for large files!!
             # We need a multiread resource, so wrap it in StringIO
             if not hasattr(resource,'seek'):
-                resource = StringIO(replay_file.read())
-            else:
-                resource = replay_file
+                resource = StringIO(resource.read())
 
-            resource_name = getattr(resource,'name','Unknown')
+            resource_name = getattr(resource, 'name', 'Unknown')
 
         return (resource, resource_name)
 

sc2reader/utils.py

@@ -616,7 +616,8 @@ def read_header(replay_file):
 
     #Sanity check that the input is in fact an MPQ file
     if buffer.empty or buffer.read_hex(4).upper() != "4D50511B":
-        raise exceptions.FileError("File '%s' is not an MPQ file" % file.name)
+        msg = "File '{0}' is not an MPQ file";
+        raise exceptions.FileError(msg.format(replay_file.name))
 
     max_data_size = buffer.read_int(LITTLE_ENDIAN)
     header_offset = buffer.read_int(LITTLE_ENDIAN)