fix some weird things from the patch from runenes,

re-replace recognisePlayerIDs(), new one converts all names to UTF-8 prior to processing, as apparently there are problems with dicts using unicode keys, and deals iwth database escaping issues.

pyfpdb/GuiBulkImport.py

@@ -208,9 +208,7 @@ class GuiBulkImport():
             self.lab_drop.set_sensitive(False)
 
 def main(argv=None):
-    """main can also be called in the python interpreter, by supplying the command line as the argument.
->>>import GuiBulkImport
->>>GuiBulkImport.main(['-f'.'~/data/hands'])"""
+    """main can also be called in the python interpreter, by supplying the command line as the argument."""
     if argv is None:
         argv = sys.argv[1:]
 
@@ -238,13 +236,14 @@ def main(argv=None):
     if os.name == 'nt': settings['os'] = 'windows'
     else:               settings['os'] = 'linuxmac'
 
-    settings.update(config.get_db_parameters('fpdb'))
+#    settings.update(config.get_db_parameters('fpdb'))
+    settings.update(config.get_db_parameters())
     settings.update(config.get_tv_parameters())
     settings.update(config.get_import_parameters())
     settings.update(config.get_default_paths())
 
     if not options.gui:
-        print """-q is deprecated. Just use "-f filename" instead"""
+        print '-q is deprecated. Just use "-f filename" instead'
         # This is because -q on its own causes an error, so -f is necessary and sufficient for cmd line use
     if not options.filename:
         i = GuiBulkImport(db, settings, config)