fixed issue 43

petehunt · petehunt · commit 4b755d797553 · 2010-12-10T10:47:31.000Z
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -537,13 +537,10 @@ def _config(key, default):
 
     def close(self):
         ''' Send the quit message and close the socket '''
-        if self.socket:
-            send_data = struct.pack('<i',1) + int2byte(COM_QUIT)
-            self.socket.send(send_data)
-            self.socket.close()
-            self.socket = None
-        else:
-            self.errorhandler(None, InterfaceError, "(0, '')")
+        send_data = struct.pack('<i',1) + int2byte(COM_QUIT)
+        self.socket.send(send_data)
+        self.socket.close()
+        self.socket = None
 
     def autocommit(self, value):
         ''' Set whether or not to commit after every execute() '''
@@ -692,6 +689,9 @@ def _read_query_result(self):
     def _send_command(self, command, sql):
         #send_data = struct.pack('<i', len(sql) + 1) + command + sql
         # could probably be more efficient, at least it's correct
+        if not self.socket:
+            self.errorhandler(None, InterfaceError, "(0, '')")
+
         if isinstance(sql, unicode):
             sql = sql.encode(self.charset)
 
diff --git a/pymysql/converters.py b/pymysql/converters.py
@@ -338,8 +338,8 @@ def convert_decimal(connection, field, data):
     decoders[FIELD_TYPE.DECIMAL] = convert_decimal
     decoders[FIELD_TYPE.NEWDECIMAL] = convert_decimal
 
-    def escape_decimal(obj, charset):
-        return unicode(obj).encode(charset)
+    def escape_decimal(obj):
+        return unicode(obj)
     encoders[Decimal] = escape_decimal
 
 except ImportError:
