From 30badd79677720fe44ee72b18237d61fd1b84648 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 12 Nov 2013 19:56:52 -0800 Subject: [PATCH] Cleaning up some stuff in dictionary and translator Former-commit-id: ca940dc4fbf1ca80e889a3dd1cf5e1c2af98ba8a --- yomi_base/japanese/dictionary.py | 5 +++-- yomi_base/japanese/translate.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yomi_base/japanese/dictionary.py b/yomi_base/japanese/dictionary.py index 3fff998..484495e 100644 --- a/yomi_base/japanese/dictionary.py +++ b/yomi_base/japanese/dictionary.py @@ -46,6 +46,7 @@ class Dictionary: def findCharacter(self, character): + assert len(character) == 1 self.requireIndex('Kanji', 'character') cursor = self.db.cursor() @@ -65,12 +66,12 @@ class Dictionary: def findCharacterVisually(self, characters): radicals = dict() for character in characters: - for radical in self.findRadicalsByCharacter(character): + for radical in self.findRadicalsByCharacter(character) or list(): radicals[radical] = radicals.get(radical, 0) + 1 characters = dict() for radical, count in radicals.items(): - for character in self.findCharactersByRadical(radical): + for character in self.findCharactersByRadical(radical) or list(): characters[character] = characters.get(character, 0) + count results = list() diff --git a/yomi_base/japanese/translate.py b/yomi_base/japanese/translate.py index bff7f01..42b5a51 100644 --- a/yomi_base/japanese/translate.py +++ b/yomi_base/japanese/translate.py @@ -51,6 +51,7 @@ class Translator: def findCharacter(self, text): + assert len(text) == 1 return self.dictionary.findCharacter(text)