pull and merge from carl (nothing changed)

pyfpdb/Database.py

@@ -71,7 +71,6 @@ import Charset
 from Exceptions import *
 
 log = Configuration.get_logger("logging.conf")
-encoder = codecs.lookup('utf-8')
 
 
 DB_VERSION = 119
@@ -1751,7 +1750,7 @@ class Database:
 
     def insertPlayer(self, name, site_id):
         result = None
-        (_name, _len) = encoder.encode(unicode(name))
+        _name = Charset.to_db_utf8(name)
         c = self.get_cursor()
         q = "SELECT name, id FROM Players WHERE siteid=%s and name=%s"
         q = q.replace('%s', self.sql.query['placeholder'])