From 861687fb99313b6cc35a4b5b60c9b47b4f1baf75 Mon Sep 17 00:00:00 2001
From: Paul Goins <general@vultaire.net>
Date: Fri, 12 Mar 2010 21:46:34 +0900
Subject: [PATCH] A few more details, plus removed out of date tests.  Works.

---
 jbparse/jbparse/kanjidic2.py |  7 ++-----
 jbparse/test/kanjidic2.py    | 35 +----------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/jbparse/jbparse/kanjidic2.py b/jbparse/jbparse/kanjidic2.py
index 3690b60..b26934d 100644
--- a/jbparse/jbparse/kanjidic2.py
+++ b/jbparse/jbparse/kanjidic2.py
@@ -32,7 +32,7 @@
 
 from __future__ import absolute_import
 
-import gzip, gettext
+import os, gzip, gettext
 from xml.etree.cElementTree import ElementTree
 gettext.install('pyjben', unicode=True)
 
@@ -190,14 +190,11 @@ class Parser(object):
     def create_indices(self):
         if self.indexed:
             return
-        print "Creating indices..."
         self.indexed = True
-
         self.by_kanji = {}
         for char in self.characters:
             literal = char.xml.find("literal").text.strip()
             self.by_kanji[literal] = char
-        print "Done creating indices!"
 
 
 def encode_or_else(s):
@@ -217,7 +214,7 @@ def encode_or_else(s):
 
 
 if __name__ == "__main__":
-    import sys, os
+    import sys
 
     try:
         dfname, args = sys.argv[1], sys.argv[2:]
diff --git a/jbparse/test/kanjidic2.py b/jbparse/test/kanjidic2.py
index dc1af17..23a452d 100644
--- a/jbparse/test/kanjidic2.py
+++ b/jbparse/test/kanjidic2.py
@@ -13,7 +13,7 @@ SRC_NAME = "/".join((SRC_DIR, SRC_NAME))
 class Kanjidic2Test(unittest.TestCase):
 
     def setUp(self):
-        self.parser = kanjidic2.Kanjidic2Parser(SRC_NAME)
+        self.parser = kanjidic2.Parser(SRC_NAME)
 
     def test_single_kanji_search(self):
         """KANJIDIC2: Search for single kanji"""
@@ -38,39 +38,6 @@ class Kanjidic2Test(unittest.TestCase):
         for char in u"天気散歩":
             self.assertTrue(char in [entry.literal for entry in l])
 
-    def test_caching(self):
-        """KANJIDIC2: Check that caching is working"""
-        self.assertFalse(self.parser.cache)
-        t = time.time()
-        self.test_single_kanji_search()
-        first_t = time.time() - t
-
-        self.assertTrue(self.parser.cache)
-        t = time.time()
-        self.test_single_kanji_search()
-        second_t = time.time() - t
-
-        print "\n\tFirst query time:  %f" % first_t
-        print "\tSecond query time: %f" % second_t
-        self.assertTrue(second_t <= first_t)
-
-    def test_no_cache(self):
-        """KANJIDIC2: Check that parser works without caching."""
-        self.parser = kanjidic2.Kanjidic2Parser(SRC_NAME, use_cache=False)
-
-        self.assertFalse(self.parser.cache)
-        t = time.time()
-        self.test_single_kanji_search()
-        first_t = time.time() - t
-
-        self.assertFalse(self.parser.cache)
-        t = time.time()
-        self.test_single_kanji_search()
-        second_t = time.time() - t
-
-        print "\n\tFirst query time:  %f" % first_t
-        print "\tSecond query time: %f" % second_t
-
     def tearDown(self):
         self.parser = None
 
-- 
2.11.4.GIT