[pypy-commit] pypy default: small tweaks

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r62173:38ea2aa0bcfc
Date: 2013-03-07 05:50 -0500
http://bitbucket.org/pypy/pypy/changeset/38ea2aa0bcfc/

Log:	small tweaks

diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -243,7 +243,7 @@
 ##########################################
 
 # SQLite version information
-sqlite_version = sqlite.sqlite3_libversion().decode('utf-8')
+sqlite_version = sqlite.sqlite3_libversion()
 
 class Error(StandardError):
     pass
@@ -1206,7 +1206,8 @@
         desc = []
         for i in xrange(sqlite.sqlite3_column_count(self._statement)):
             name = sqlite.sqlite3_column_name(self._statement, i)
-            name = name.decode('utf-8').split("[")[0].strip()
+            if name is not None:
+                name = name.decode('utf-8').split("[")[0].strip()
             desc.append((name, None, None, None, None, None, None))
         return desc