Version bump v10.2.2-beta.4

Kronuz · Kronuz · commit 5b0664cebe71 · 2017-07-03T16:56:28.000-05:00
+ Passing many more tests:

	Python 2.7:
		4 skips, 80 failures

	Python 3.6:
		4 skips, 126 failures, 1 error
diff --git a/codeintel/HTMLTreeParser.py b/codeintel/HTMLTreeParser.py
@@ -111,7 +111,6 @@ def add(self, name, reg, mods=None ):
         a("attrfinderRE" , "(?:[\n \t]*)(%(Name)s)(?:%(S)s)?=(?:%(S)s)?(%(AttValSE)s)", re.S|re.U)
     return g_collector
 
-is_not_ascii = re.compile(eval(r'u"[\u0080-\uffff]"')).search
 
 def parseiter(data, markuponly=0):
     if markuponly:
@@ -271,9 +270,9 @@ def end_tag(self, tag, loc=None):
         return self._last
 
     def data(self, data):
-        if isinstance(data, type('')) and is_not_ascii(data):
+        if not isinstance(data, six.text_type):
             # convert to unicode, but only if necessary
-            data = six.text_type(data, self.encoding, "ignore")
+            data = data.decode('utf-8', 'ignore')
         ElementTree.TreeBuilder.data(self, data)
 
     def close(self):
diff --git a/codeintel/__init__.py b/codeintel/__init__.py
@@ -1 +1 @@
-__version__ = '10.2.2-beta.3'
+__version__ = '10.2.2-beta.4'
diff --git a/codeintel/codeintel2/accessor.py b/codeintel/codeintel2/accessor.py
@@ -175,12 +175,10 @@ def tokens(self):
     def _char_pos_from_byte_pos(self, byte_pos):
         line = self.line_from_pos(byte_pos)
         byte_offset, char_offset = self.__position_data[line][:2]
-        next_byte_offset = (byte_offset + len(self.content[char_offset].encode("utf-8")))
         try:
-            while next_byte_offset <= byte_pos:
-                byte_offset = next_byte_offset
+            while byte_offset < byte_pos:
+                byte_offset += len(self.content[char_offset].encode("utf-8"))
                 char_offset += 1
-                next_byte_offset += len(self.content[char_offset].encode("utf-8"))
         except IndexError:
             pass  # running past EOF
         return char_offset
diff --git a/codeintel/codeintel2/css_linter.py b/codeintel/codeintel2/css_linter.py
@@ -162,7 +162,7 @@ class _CSSLexer(Lexer):
     def __init__(self, code, language):
         Lexer.__init__(self)
         # We don't care about any JS operators in `...` escapes
-        terms = '@{ ${ ~= |= ::'
+        terms = r'@{ ${ ~= |= ::'
         if language == "Less":
             terms += ' || &&'
         self.multi_char_ops = self.build_dict(terms)
@@ -259,7 +259,9 @@ def _add_result(self, message, tok, status=1):
                                    status)
 
     def _add_result_tok_parts(self, message, line_start, col_start, line_end, col_end, text, status=1):
-        if not self._results or self._results[-1].line_end < line_start:
+        if (not self._results or
+            self._results[-1].line_end is not None and line_start is not None and
+            self._results[-1].line_end < line_start):
             if not "got" in message:
                 if line_start is None:
                     message += ", reached end of file"
diff --git a/codeintel/codeintel2/database/projlib.py b/codeintel/codeintel2/database/projlib.py
@@ -94,7 +94,7 @@ def __init__(self, mgr, db, proj):
 
         self.name = basename(proj.path)
         self.base_dir = join(self.db.base_dir, "db", "projs", 
-                             md5(proj.path).hexdigest())
+                             md5(proj.path.encode('utf-8')).hexdigest())
         self._proj_lib_from_lang = weakref.WeakValueDictionary()
         self._idx_lock = threading.RLock()
         self._dirs_from_basename = None
diff --git a/codeintel/codeintel2/lang_css.py b/codeintel/codeintel2/lang_css.py
@@ -973,7 +973,7 @@ def async_eval_at_trg(self, buf, trg, ctlr):
     def _get_all_anchors_names_in_project(self):
         #anchors = []
         #pos = 0
-        #LENGTH = accessor.length
+        #LENGTH = accessor.length()
         #style = 0
         #func_style_at_pos = accessor.style_at_pos
         #func_char_at_pos = accessor.char_at_pos
diff --git a/codeintel/codeintel2/lang_perl.py b/codeintel/codeintel2/lang_perl.py
@@ -1054,7 +1054,7 @@ def async_eval_at_trg(self, buf, trg, ctlr):
                 citdl_expr = citdl_expr[1:]
             if trg.id[1] == TRG_FORM_DEFN and citdl_expr[0] == '$':
                 current_pos = trg.pos
-                lim = buf.accessor.length
+                lim = buf.accessor.length()
                 style = buf.accessor.style_at_pos(current_pos)
                 while (style == ScintillaConstants.SCE_PL_SCALAR or 
                        ScintillaConstants.SCE_PL_REGEX_VAR <= style <= ScintillaConstants.SCE_PL_STRING_QR_VAR) and current_pos < lim:
diff --git a/codeintel/codeintel2/lang_php.py b/codeintel/codeintel2/lang_php.py
@@ -135,7 +135,7 @@ def _functionCalltipTrigger(self, ac, pos, DEBUG=False):
         paren_count = 0
         p = pos
         min_p = max(0, p - 200) # look back max 200 chars
-        while p > min_p:
+        while p and p > min_p:
             p, c, style = ac.getPrecedingPosCharStyle(ignore_styles=self.comment_styles)
             if style == self.operator_style:
                 if c == ")":
diff --git a/codeintel/codeintel2/lang_python.py b/codeintel/codeintel2/lang_python.py
@@ -948,7 +948,7 @@ def trg_from_pos(self, pos, implicit=True):
             if beforeChar and beforeChar in " \t":
                 if text.endswith("def"):
                     posttext = accessor.text_range(pos,
-                                                   min(accessor.length, pos+20)
+                                                   min(accessor.length(), pos+20)
                                                   ).replace(" ", "")
                     if DEBUG:
                         print("trg_from_pos:: magic-symbols - def")
diff --git a/codeintel/codeintel2/parser_cix.py b/codeintel/codeintel2/parser_cix.py
@@ -75,8 +75,7 @@ def get_common_attrs(node):
     return attrs
 
 def sort_by_lines(adict):
-    intermed = [(adict[k].line_num, adict[k].type, k) for k in adict.keys()]
-    intermed.sort()
+    intermed = sorted((adict[k].line_num or 0, adict[k].type or "", k or "") for k in adict.keys())
     return intermed
 
 
diff --git a/codeintel/koDTD.py b/codeintel/koDTD.py
@@ -105,7 +105,7 @@ def __init__(self):
         self.elements_caseless = {}
 
     def element_info(self, element_name):
-        name = element_name.lower()
+        name = element_name and element_name.lower()
         if name in self.elements_caseless:
             return self.elements_caseless[name]
         return None
diff --git a/codeintel/langinfo_other.py b/codeintel/langinfo_other.py
@@ -48,7 +48,7 @@ class MakefileLangInfo(LangInfo):
     name = "Makefile"
     conforms_to_bases = ["Text"]
     exts = [".mak"]
-    filename_patterns = [re.compile(br'^[Mm]akefile.*$')]
+    filename_patterns = [re.compile(r'^[Mm]akefile.*$')]
 
 class CMakeLangInfo(LangInfo):
     name = "CMake"
diff --git a/codeintel/langinfo_prog.py b/codeintel/langinfo_prog.py
@@ -294,6 +294,7 @@ class JavaScriptLangInfo(_JSLikeLangInfo):
 class NodeJSLangInfo(_JSLikeLangInfo):
     name = "Node.js"
     exts = ['.js']
+    is_minor_variant = JavaScriptLangInfo
 
 class CoffeeScriptLangInfo(_JSLikeLangInfo):
     name = "CoffeeScript"
diff --git a/codeintel/test2/citestsupport.py b/codeintel/test2/citestsupport.py
@@ -50,6 +50,7 @@
 from hashlib import md5
 import re
 import six
+from six.moves import reload_module as reload
 
 from codeintel2.manager import Manager
 from codeintel2.util import indent, dedent, banner, markup_text, unmark_text
diff --git a/codeintel/test2/test_csslint.py b/codeintel/test2/test_csslint.py
@@ -85,10 +85,10 @@ def test_expect_good_files(self):
         # Fails to parse @keyframes directives.
         join(_skin_dir, "komodo.p.css"),
     ]
-    def _walk_skin_files(self, data, dirname, fnames):
-        for fname in fnames:
+    def _walk_skin_files(self, dirpath, dirnames):
+        for fname in dirnames:
             if fname.endswith(".css"):
-                fpath = join(dirname, fname)
+                fpath = join(dirpath, fname)
                 if fpath in self._skipSkinFiles:
                     continue
                 fd = open(fpath, 'rb')
@@ -102,10 +102,12 @@ def _walk_skin_files(self, data, dirname, fnames):
     def test_komodo_skin_files_01(self):
         # Test these under CSS, SCSS, and Less
         self.assertTrue(os.path.exists(join(self._skin_dir, "codeintel.p.css")), "%s: missing codeintel.p.css" % self._skin_dir)
-        os.path.walk(self._skin_dir, self._walk_skin_files, None)
+        for dirpath, dirnames in os.walk(self._skin_dir):
+            self._walk_skin_files(dirpath, dirnames)
 
     def test_komodo_skin_files_02(self):
-        os.path.walk(self._modules_dir, self._walk_skin_files, None)
+        for dirpath, dirnames in os.walk(self._modules_dir):
+            self._walk_skin_files(dirpath, dirnames)
         
     def test_jezdez(self):
         path = join(self.test_dir, "bits", "bad_css_files", "jezdez-reset-fonts-grids.css")
diff --git a/codeintel/test2/test_oop.py b/codeintel/test2/test_oop.py
@@ -44,7 +44,8 @@ class OOPTestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         unittest.TestCase.__init__(self, *args, **kwargs)
         self.conn = None
-        self.stdio = None
+        self.stdi = None
+        self.stdo = None
         self.proc = None
 
     def _fixup_for_dbgp(self, argv, env):
@@ -114,17 +115,25 @@ def setUp(self):
         self.proc = subprocess.Popen(argv, env=env)
 
         self.socket = self.conn.accept()[0]
-        self.stdio = self.socket.makefile("r+b", 0)
+        self.stdo = self.socket.makefile('wb', 0)
+        self.stdi = self.socket.makefile('rb', 0)
 
         self.proc.poll()
         self.assertIsNone(self.proc.returncode,
                           "Child process died prematurely")
-        buf = self.stdio.read(3)
-        self.assertEqual(buf, "2{}")
+        buf = b''
+        while len(buf) < 3:
+            r = self.stdi.read(3 - len(buf))
+            if not r:
+                break
+            buf += r
+        self.assertEqual(buf, b'2{}')
 
     def tearDown(self):
-        if self.stdio:
-            self.stdio.close()
+        if self.stdi:
+            self.stdi.close()
+        if self.stdo:
+            self.stdo.close()
         if self.socket:
             self.socket.shutdown(socket.SHUT_RDWR)
             self.socket.close()
@@ -150,7 +159,7 @@ def timeout():
     def send(self, **kwargs):
         data = json.dumps(kwargs, separators=(",", ":"))
         log.debug("writing: [%s]", data)
-        self.stdio.write(str(len(data)) + data)
+        self.stdo.write(b"%d%s" % (len(data), data.encode('utf-8')))
 
     def _test_with_commands(self, commands, ignore_unsolicited=True):
         """
@@ -174,21 +183,21 @@ def _test_with_commands(self, commands, ignore_unsolicited=True):
                 expected = None
             command = dict(command, req_id=str(i))
             self.send(**command)
-            buf = ""
+            buf = b''
             while True:
-                ch = self.stdio.read(1)
-                if ch == "{":
+                ch = self.stdi.read(1)
+                if ch == b'{':
                     length = int(buf, 10)
-                    buf = ch + self.stdio.read(length - 1)
+                    buf = ch + self.stdi.read(length - 1)
                     result = json.loads(buf)
                     log.debug("receive: %r", result)
                     if ignore_unsolicited:
                         if "req_id" not in result:
-                            buf = ""
+                            buf = b''
                             continue
                     break
                 else:
-                    self.assertIn(ch, "0123456789",
+                    self.assertIn(ch, b'0123456789',
                                   "Invalid data: %s" % (buf + ch,))
                     buf += ch
             if expected is not None:
diff --git a/codeintel/test2/test_python.py b/codeintel/test2/test_python.py
@@ -93,7 +93,7 @@ def pif(self, aa):
                     pass
         """)
         buf = self.mgr.buf_from_content(blam, lang=self.lang, path="blam.py")
-        open(join(self.test_catalog_dirs[0], "blam.cix"), 'w').write(buf.cix)
+        open(join(self.test_catalog_dirs[0], "blam.cix"), 'wb').write(buf.cix)
 
         # Ensure the catalog is updated.
         self.mgr.db.get_catalogs_zone().update()

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '10.2.2-beta.3'`
	`1`	`+__version__ = '10.2.2-beta.4'`