Merge lp:~bsdemon/myconnpy/fixes into lp:~geertjmvdk/myconnpy/main

[andreypopp]

Fixed bug with CharacterSet.get_charset_info -- description of supported charset should be list.

[lp:~bsdemon/myconnpy/fixes]

226. By andreypopp on 2010-03-31

Exception handling in get_charset_info specialized

227. By andreypopp on 2010-04-02

If we have no items in buffer after receive -- it is disconnect

228. By andreypopp on 2010-04-02

Removed call overhead on Connection.recv and added specialized error handling

[Geert JM Vanderkelen (geertjmvdk)]

We agreed to not merge but take the changes into consideration.
It's also because I was not that familiar yet with merging :)

-Geert

review: Disapprove

[andreypopp (bsdemon)]

That's ok, thanks!

On May 28, 2010, at 6:15 PM, Geert JM Vanderkelen wrote:

> Review: Disapprove
> We agreed to not merge but take the changes into consideration.
> It's also because I was not that familiar yet with merging :)
>
> -Geert
> --
> https://code.launchpad.net/~bsdemon/myconnpy/fixes/+merge/22535
> You are the owner of lp:~bsdemon/myconnpy/fixes.

Unmerged revisions

228. By andreypopp on 2010-04-02

Removed call overhead on Connection.recv and added specialized error handling

227. By andreypopp on 2010-04-02

If we have no items in buffer after receive -- it is disconnect

226. By andreypopp on 2010-03-31

Exception handling in get_charset_info specialized

225. By andreypopp on 2010-03-31

Fixed description of supported charsets -- should be list.

=== modified file 'mysql/connector/connection.py'
--- mysql/connector/connection.py	2010-02-26 15:36:04 +0000
+++ mysql/connector/connection.py	2010-04-02 14:44:24 +0000
@@ -71,16 +71,12 @@
         except Exception, e:
             raise errors.OperationalError('%s' % e)
 
-    def _next_buffer(self):
-        buf = self.buffer.popleft()
-        return buf
-            
     def recv(self):
         """Receive packets from the MySQL server
         """
         try:
-            return self._next_buffer()
-        except:
+            return self.buffer.popleft()
+        except IndexError:
             pass
         
         pktnr = -1
@@ -107,7 +103,10 @@
         except:
             raise
         
-        return self._next_buffer()
+        try:
+            return self.buffer.popleft()
+        except IndexError:
+            raise errors.InterfaceError(errno=2055)
 
     def set_connection_timeout(self, timeout):
         self.connection_timeout = timeout

=== modified file 'mysql/connector/constants.py'
--- mysql/connector/constants.py	2010-02-17 12:21:06 +0000
+++ mysql/connector/constants.py	2010-04-02 14:44:24 +0000
@@ -385,7 +385,7 @@
     name of the used character set or collation.
     """
     
-    desc = (
+    desc = [
         None,
         ("big5","big5_chinese_ci"), # 1
         ("latin2","latin2_czech_cs"), # 2
@@ -597,7 +597,7 @@
         ("utf8","utf8_persian_ci"), # 208
         ("utf8","utf8_esperanto_ci"), # 209
         ("utf8","utf8_hungarian_ci"), # 210
-    )
+    ]
 
     @classmethod
     def get_info(cls,setid):
@@ -644,9 +644,9 @@
         
         try:
             idx = cls.desc.index((name,collation))
-            return (idx,) + (name,collation)
-        except:
+        except ValueError: # list.index(x): x not in list
             raise ProgrammingError("Character set '%s' unsupported." % (name))
+        return (idx,) + (name,collation)
         
     @classmethod
     def get_supported(cls):