Convert some strings to unicode, as they might receive unicode arguments

Author: DarkFenX

flow.py

@@ -91,7 +91,7 @@ def _parse_filter(self, name_filter):
             elif symbol == ')' and inarg is True:
                 inarg = False
             else:
-                msg = 'unexpected character "{}" at position {}'.format(symbol, pos_start)
+                msg = u'unexpected character "{}" at position {}'.format(symbol, pos_start)
                 raise FilterParseError(msg)
         if inarg is True:
             msg = 'parenthesis is not closed'

util/resource_browser.py

@@ -66,11 +66,11 @@ def get_file_info(self, resource_path):
 
     def __verify_data(self, data, file_info):
         if len(data) != file_info.file_size:
-            raise FileIntegrityError('file size mismatch when reading {}'.format(file_info.resource_path))
+            raise FileIntegrityError(u'file size mismatch when reading {}'.format(file_info.resource_path))
         m = hashlib.md5()
         m.update(data)
         if m.hexdigest() != file_info.file_hash:
-            raise FileIntegrityError('file hash mismatch when reading {}'.format(file_info.resource_path))
+            raise FileIntegrityError(u'file hash mismatch when reading {}'.format(file_info.resource_path))
 
     @cachedproperty
     def _resource_index(self):
@@ -85,7 +85,7 @@ def _resource_index(self):
                     file_hash=file_hash,
                     file_size=int(file_size),
                     compressed_size=int(compressed_size))
-        app_index_path = os.path.join(self._eve_path, 'SharedCache', 'index_{}.txt'.format(self._server_alias))
+        app_index_path = os.path.join(self._eve_path, 'SharedCache', u'index_{}.txt'.format(self._server_alias))
         with open(app_index_path) as f:
             for resource_path, file_relpath, file_hash, file_size, compressed_size, version in csv.reader(f):
                 index[resource_path] = FileInfo(

util/translator.py

@@ -250,8 +250,8 @@ def _load_lang_data(self, language):
         """
         msg_map_phb = {}
         try:
-            lang_data = self._load_pickle('res:/localization/localization_{}'.format(language))
-            lang_data_fsd = self._load_pickle('res:/localizationfsd/localization_fsd_{}'.format(language))
+            lang_data = self._load_pickle(u'res:/localization/localization_{}'.format(language))
+            lang_data_fsd = self._load_pickle(u'res:/localizationfsd/localization_fsd_{}'.format(language))
         except ContainerNameError:
             msg = u'data for language "{}" cannot be loaded'.format(language)
             raise LanguageNotAvailable(msg)

writer/json_writer.py

@@ -120,7 +120,7 @@ def write(self, miner_name, container_name, container_data):
             # We're handling sorting in customized encoder
             sort_keys=False)
         data_bytes = data_str.encode('utf8')
-        filepath = os.path.join(folder, '{}.json'.format(self.__secure_name(container_name)))
+        filepath = os.path.join(folder, u'{}.json'.format(self.__secure_name(container_name)))
         with open(filepath, 'wb') as f:
             f.write(data_bytes)