# HG changeset patch # User Paul Boddie # Date 1317577950 -7200 # Node ID fc8abb1911d0ac8074c52561056e76ec66e77706 # Parent 5a61083be20dd27d4efc1447d388552ea3b8a3ae A TextFile instance is not actually needed to wrap a file object. diff -r 5a61083be20d -r fc8abb1911d0 simplex/readers.py --- a/simplex/readers.py Sun Oct 02 17:40:02 2011 +0200 +++ b/simplex/readers.py Sun Oct 02 19:52:30 2011 +0200 @@ -20,7 +20,10 @@ class TextFile: - "A wrapper around text files." + """ + An example wrapper around text files, mostly duplicating the facilities of + file objects itself. + """ def __init__(self, f): self.f = f diff -r 5a61083be20d -r fc8abb1911d0 test_indexed.py --- a/test_indexed.py Sun Oct 02 17:40:02 2011 +0200 +++ b/test_indexed.py Sun Oct 02 19:52:30 2011 +0200 @@ -13,18 +13,17 @@ sys.exit(1) f = open(filename) -reader = TextFile(f) accessor = DelimitedRecord(fields, numeric=(numeric == "true")) try: t = time.time() - l = make_index(reader, accessor.get_key, int(interval)) + l = make_index(f, accessor.get_key, int(interval)) print "Indexed in %s seconds." % (time.time() - t) # Now use the index. for term in terms: t = time.time() - line = find_with_index(reader, accessor.get_key, l, accessor.convert(term)) + line = find_with_index(f, accessor.get_key, l, accessor.convert(term)) if line: print "Found (at %s seconds)...\n%s" % (time.time() - t, line) diff -r 5a61083be20d -r fc8abb1911d0 test_scan.py --- a/test_scan.py Sun Oct 02 17:40:02 2011 +0200 +++ b/test_scan.py Sun Oct 02 19:52:30 2011 +0200 @@ -13,14 +13,13 @@ sys.exit(1) f = open(filename) -reader = TextFile(f) accessor = DelimitedRecord(fields, numeric=(numeric == "true")) try: for term in terms: - reader.seek(0) + f.seek(0) t = time.time() - line = find_in_file(reader, accessor.get_key, accessor.convert(term)) + line = find_in_file(f, accessor.get_key, accessor.convert(term)) if line: print "Found (at %s seconds)...\n%s" % (time.time() - t, line) finally: