Fixed more tests that were broken after the renaming.

Author: ZeroCool940711

benchmark/dictionary.py

@@ -35,7 +35,7 @@ def whoosh_schema(self):
         return schema
 
     def zcatalog_setup(self, cat):
-        from zcatalog import indexes  # @UnresolvedImport
+        from zcatalog import indexes  # type: ignore @UnresolvedImport
 
         cat["head"] = indexes.FieldIndex(field_name="head")
         cat["body"] = indexes.TextIndex(field_name="body")

benchmark/marc21.py

@@ -2,7 +2,7 @@
 import fnmatch, logging, os.path, re
 
 from whoosh import analysis, fields, index, qparser, query, scoring
-from whoosh.compat import xrange
+from whoosh.compat import range
 from whoosh.util import now
 
 
@@ -59,7 +59,7 @@ def parse_record(data, tags=None):
     field_count = (dirend - dirstart) // DIRECTORY_ENTRY_LEN
 
     result = {}
-    for i in xrange(field_count):
+    for i in range(field_count):
         start = dirstart + i * DIRECTORY_ENTRY_LEN
         end = start + DIRECTORY_ENTRY_LEN
         tag = data[start : start + 3]

benchmark/reuters.py

@@ -22,7 +22,7 @@ def whoosh_schema(self):
         return schema
 
     def zcatalog_setup(self, cat):
-        from zcatalog import indexes  # @UnresolvedImport
+        from zcatalog import indexes  # type: ignore @UnresolvedImport
 
         cat["id"] = indexes.FieldIndex(field_name="id")
         cat["headline"] = indexes.TextIndex(field_name="headline")

docs/source/facets.rst

@@ -386,12 +386,12 @@ document numbers in the same relative order as in the results. You can use the
 return the document's stored fields as a dictionary::
 
     for category_name in categories:
-        print "Top 5 documents in the %s category" % category_name
+        print ("Top 5 documents in the %s category") % category_name
         doclist = categories[category_name]
         for docnum, score in doclist[:5]:
-            print "  ", searcher.stored_fields(docnum)
+            print ("  ", searcher.stored_fields(docnum))
         if len(doclist) > 5:
-            print "  (%s more)" % (len(doclist) - 5)
+            print ("  (%s more)") % (len(doclist) - 5)
 
 If you want different information about the groups, for example just the count
 of documents in each group, or you don't need the groups to be ordered, you can

scripts/make_checkpoint.py

@@ -8,7 +8,7 @@
 from datetime import datetime
 
 from whoosh import fields, index
-from whoosh.compat import u, xrange
+from whoosh.compat import u, range
 
 
 if len(sys.argv) < 2:
@@ -44,7 +44,7 @@
         for num in range(100):
             frac += 0.15
             path = u("%s/%s" % (segnum, num))
-            title = " ".join(random.choice(words) for _ in xrange(100))
+            title = " ".join(random.choice(words) for _ in range(100))
             dt = datetime(year=2000 + counter, month=(counter % 12) + 1, day=15)
 
             w.add_document(

src/whoosh/analysis/intraword.py

@@ -29,7 +29,7 @@
 from collections import deque
 
 from whoosh.compat import u, text_type
-from whoosh.compat import xrange
+from whoosh.compat import range
 from whoosh.analysis.filters import Filter
 
 
@@ -71,7 +71,7 @@ def subwords(self, s, memo):
         if s in memo:
             return memo[s]
 
-        for i in xrange(1, len(s)):
+        for i in range(1, len(s)):
             prefix = s[:i]
             if prefix in self.wordset:
                 suffix = s[i:]

src/whoosh/analysis/morph.py

@@ -180,15 +180,15 @@ def algorithms(self):
         library.
         """
 
-        import Stemmer  # @UnresolvedImport
+        import Stemmer  # type: ignore @UnresolvedImport
 
         return Stemmer.algorithms()
 
     def cache_info(self):
         return None
 
     def _get_stemmer_fn(self):
-        import Stemmer  # @UnresolvedImport
+        import Stemmer  # type: ignore @UnresolvedImport
 
         stemmer = Stemmer.Stemmer(self.lang)
         stemmer.maxCacheSize = self.cachesize

src/whoosh/analysis/ngrams.py

@@ -26,7 +26,7 @@
 # policies, either expressed or implied, of Matt Chaput.
 
 from whoosh.compat import text_type
-from whoosh.compat import xrange
+from whoosh.compat import range
 from whoosh.analysis.acore import Token
 from whoosh.analysis.filters import Filter, LowercaseFilter
 from whoosh.analysis.tokenizers import Tokenizer, RegexTokenizer
@@ -89,7 +89,7 @@ def __call__(
 
         if mode == "query":
             size = min(self.max, inlen)
-            for start in xrange(0, inlen - size + 1):
+            for start in range(0, inlen - size + 1):
                 end = start + size
                 if end > inlen:
                     continue
@@ -105,8 +105,8 @@ def __call__(
                 yield t
                 pos += 1
         else:
-            for start in xrange(0, inlen - self.min + 1):
-                for size in xrange(self.min, self.max + 1):
+            for start in range(0, inlen - self.min + 1):
+                for size in range(self.min, self.max + 1):
                     end = start + size
                     if end > inlen:
                         continue
@@ -193,7 +193,7 @@ def __call__(self, tokens):
                         t.startchar = t.endchar - size
                     yield t
                 else:
-                    for start in xrange(0, len(text) - size + 1):
+                    for start in range(0, len(text) - size + 1):
                         t.text = text[start : start + size]
                         if chars:
                             t.startchar = startchar + start
@@ -202,7 +202,7 @@ def __call__(self, tokens):
             else:
                 if at == -1:
                     limit = min(self.max, len(text))
-                    for size in xrange(self.min, limit + 1):
+                    for size in range(self.min, limit + 1):
                         t.text = text[:size]
                         if chars:
                             t.endchar = startchar + size
@@ -212,14 +212,14 @@ def __call__(self, tokens):
                     if chars:
                         original_startchar = t.startchar
                     start = max(0, len(text) - self.max)
-                    for i in xrange(start, len(text) - self.min + 1):
+                    for i in range(start, len(text) - self.min + 1):
                         t.text = text[i:]
                         if chars:
                             t.startchar = original_startchar + i
                         yield t
                 else:
-                    for start in xrange(0, len(text) - self.min + 1):
-                        for size in xrange(self.min, self.max + 1):
+                    for start in range(0, len(text) - self.min + 1):
+                        for size in range(self.min, self.max + 1):
                             end = start + size
                             if end > len(text):
                                 continue

src/whoosh/automata/fsa.py

@@ -5,7 +5,7 @@
 import sys
 from bisect import bisect_left
 
-from whoosh.compat import iteritems, next, text_type, unichr, xrange
+from whoosh.compat import iteritems, next, text_type, unichr, range
 
 
 unull = unichr(0)
@@ -340,7 +340,7 @@ def minimize(self):
         parts = [final_states, reachable - final_states]
         while changed:
             changed = False
-            for i in xrange(len(parts)):
+            for i in range(len(parts)):
                 part = parts[i]
                 changed_part = False
                 for label in labels: