Version bump v10.2.2-beta.7

+ Fix issue compiling xElementTree in Python 2.6

+ Fix problem with SQLite transactions and symbol.db

+ PHP function signature with return type not lowercased

+ Python function signatures fixed

+ Python 2-3 translation improved

+ Passing many more tests:
    Python 2.7: (4 skips, 60 failures)
    Python 3.6: (4 skips, 82 failures, 1 error)

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '10.2.2-beta.6'
+__version__ = '10.2.2-beta.7'

codeintel/codeintel2/database/langlib.py

@@ -963,20 +963,20 @@ def _get_symbols_db_conn(self):
         except:
             log.exception("Unable to create/open symbols.db")
             return None
-        cursor = conn.cursor()
         if not exists:
-            cursor.execute("""
-                CREATE TABLE symbols ('symbol_id' INTEGER PRIMARY KEY,
-                                      'symbol' TEXT NOT NULL,
-                                      'type' TEXT NOT NULL,
-                                      'filepath' TEXT NOT NULL,
-                                      'lineno' INTEGER NOT NULL,
-                                      'lang' TEXT NOT NULL,
-                                      'parent' TEXT)
-            """)
-            cursor.execute("CREATE UNIQUE INDEX 'symbol_id' on symbols (symbol_id ASC)")
             try:
-                cursor.execute("COMMIT")
+                with conn:
+                    cursor = conn.cursor()
+                    cursor.execute("""
+                        CREATE TABLE symbols ('symbol_id' INTEGER PRIMARY KEY,
+                                            'symbol' TEXT NOT NULL,
+                                            'type' TEXT NOT NULL,
+                                            'filepath' TEXT NOT NULL,
+                                            'lineno' INTEGER NOT NULL,
+                                            'lang' TEXT NOT NULL,
+                                            'parent' TEXT)
+                    """)
+                    cursor.execute("CREATE UNIQUE INDEX 'symbol_id' on symbols (symbol_id ASC)")
             except apsw.SQLError:
                 log.warn("Unable to create symbols.db: possibly exists?")
                 return None
@@ -995,9 +995,14 @@ def _update_symbols_db(self, conn, action, blob):
         """
         if not conn:
             return
-        
+        try:
+            with conn:
+                self._update_symbols_db_transaction(conn, action, blob)
+        except apsw.SQLError:
+            log.error("Unable to save to symbols db.")
+
+    def _update_symbols_db_transaction(self, conn, action, blob):
         cursor = conn.cursor()
-        cursor.execute("BEGIN")
 
         # Delete any symbols in the blob's file.
         if action == "update" or action == "remove":
@@ -1028,11 +1033,6 @@ def insert_all(elem, parent=None):
                     insert_all(n, valid and elem)
 
             insert_all(blob)
-        
-        try:
-            cursor.execute("commit")
-        except apsw.SQLError:
-            log.error("Unable to save to symbols db.")
 
     def _close_symbols_db_conn(self, conn):
         """

codeintel/codeintel2/lang_php.py

@@ -1558,7 +1558,7 @@ def __init__(self, funcname, phpArgs, lineno, depth=0,
             if docinfo[2]:
                 self.returnType = docinfo[2][0]
         if self.returnType:
-            self.signature = '%s %s' % (self.returnType.lower(), self.signature, )
+            self.signature = '%s %s' % (self.returnType, self.signature, )
         self.signature += "("
         if self.args:
             self.signature += ", ".join([x.signature for x in self.args])