Version bump v2.0.0-beta.22

+ Python 3 compatibility: Fix languages stdlib II
+ Client: Check pipe exists

Author: Kronuz

codeintel/__init__.py

@@ -1 +1 @@
-__version__ = '2.0.0-beta.21'
+__version__ = '2.0.0-beta.22'

codeintel/client.py

@@ -818,6 +818,8 @@ def _send(self, callback=None, **kwargs):
         calling thread until the data has been written (though possibly not yet
         received on the other end).
         """
+        if not self.pipe:
+            return
         req_id = hex(self._next_id)
         kwargs['req_id'] = req_id
         text = json.dumps(kwargs, separators=(',', ':'))

codeintel/codeintel2/database/stdlib.py

@@ -271,6 +271,29 @@ def reportMemory(self):
         return total_mem_usage
 
 
+class Version(tuple):
+    def __init__(self, ver):
+        self.ver = ver
+
+    def __gt__(self, other):
+        try:
+            if isinstance(other, Version):
+                return self.ver > other.ver
+            else:
+                return self.ver > other
+        except TypeError:
+            return False
+
+    def __lt__(self, other):
+        try:
+            if isinstance(other, Version):
+                return self.ver < other.ver
+            else:
+                return self.ver < other
+        except TypeError:
+            return False
+
+
 class StdLibsZone(object):
     """Singleton zone managing the db/stdlibs/... area.
 
@@ -297,7 +320,7 @@ def vers_and_names_from_lang(self, lang):
         #              ((5,3), "php-5.3")
         #         ],
         #    "ruby": [
-        #              ((0,0), "ruby"),
+        #              (None, "ruby"),
         #         ],
         #    ...
         #  }
@@ -314,12 +337,12 @@ def vers_and_names_from_lang(self, lang):
                     ver = _ver_from_ver_str(ver_str)
                 else:
                     base = name
-                    ver = (0, 0)
+                    ver = None
                 if base.lower() != lang.lower():
                     # Only process when the base name matches the language.
                     # I.e. skip if base is "python3" and lang is "python".
                     continue
-                vers_and_names.append((ver, name))
+                vers_and_names.append(Version((ver, name)))
             vers_and_names.sort()
             self._vers_and_names_from_lang[lang] = vers_and_names
         return vers_and_names
@@ -383,7 +406,7 @@ def get_lib(self, lang, ver_str=None):
 
         # Here is something like what we have for PHP:
         #    vers_and_names = [
-        #        ((0,0), "php"),
+        #        (None, "php"),
         #        ((4,0), "php-4.0"),
         #        ((4,1), "php-4.1"),
         #        ((4,2), "php-4.2"),
@@ -399,7 +422,7 @@ def get_lib(self, lang, ver_str=None):
         #   PHP 4.0.2:      php-4.0 (higher sub-version)
         #   PHP 4.4:        php-4.3
         #   PHP 6.0:        php-5.1
-        key = (ver, "zzz") # 'zzz' > any stdlib name (e.g., 'zzz' > 'php-4.2')
+        key = Version((ver, "zzz")) # 'zzz' > any stdlib name (e.g., 'zzz' > 'php-4.2')
         idx = max(0, bisect.bisect_right(vers_and_names, key)-1)
         log.debug("best stdlib fit for %s ver=%s in %s is %s",
                   lang, ver, vers_and_names, vers_and_names[idx])
@@ -508,7 +531,7 @@ def _update_lang_with_ver(self, lang, ver=None, progress_cb=None):
         if progress_cb:
             try:    progress_cb("Determining necessary updates...", 5)
             except: log.exception("error in progress_cb (ignoring)")
-        if ver != (0, 0):
+        if ver is not None:
             ver_str = ".".join(map(str, ver))
             cix_path = join(self.stdlibs_dir,
                             "%s-%s.cix" % (safe_lang_from_lang(lang), ver_str))
@@ -539,9 +562,9 @@ def _update_lang_with_ver(self, lang, ver=None, progress_cb=None):
 
     def update_lang(self, lang, progress_cb=None, ver=None):
         vers_and_names = self.vers_and_names_from_lang(lang)
-        if ver != (0, 0):
+        if ver is not None:
             ver = _ver_from_ver_str(ver)
-            key = (ver, "zzz") # 'zzz' > any stdlib name (e.g., 'zzz' > 'php-4.2')
+            key = Version((ver, "zzz")) # 'zzz' > any stdlib name (e.g., 'zzz' > 'php-4.2')
             idx = max(0, bisect.bisect_right(vers_and_names, key)-1)
             log.debug("update_lang: best stdlib fit for %s ver=%s in %s is %s",
                       lang, ver, vers_and_names, vers_and_names[idx])