Commits

Matt Chaput committed 868f0dd

Commented or removed out unused code.

Comments (0)

Files changed (2)

src/whoosh/filedb/fileindex.py

             if reuse:
                 # Put all atomic readers in a dictionary keyed by their
                 # generation, so we can re-use them if them if possible
-                readers = [r for r, offset in reuse.leaf_readers()]
+                readers = [r for r, _ in reuse.leaf_readers()]
                 reusable = dict((r.generation(), r) for r in readers)
             
             # Make a function to open readers, which reuses reusable readers.

src/whoosh/filedb/filewriting.py

 # Merge policies
 
 # A merge policy is a callable that takes the Index object, the SegmentWriter
-# object, and the current segment list (not including the segment being written),
-# and returns an updated segment list (not including the segment being written).
+# object, and the current segment list (not including the segment being
+# written), and returns an updated segment list (not including the segment
+# being written).
 
 def NO_MERGE(writer, segments):
     """This policy does not merge any existing segments.
         
         info = ix._read_toc()
         self.schema = info.schema
-        self.ssnames = set(self.schema.special_spelling_names())
+        #self.ssnames = set(self.schema.special_spelling_names())
         self.segments = info.segments
         self.storage = ix.storage
         self.indexname = ix.indexname
         #t = now()
         self._check_state()
         schema = self.schema
-        ssnames = self.ssnames
+        #ssnames = self.ssnames
         docboost = self._doc_boost(fields)
         
         # Sort the keys