From 32ab87b62490044f250e6b5a19f164ea93e28534 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Sat, 29 Jan 2011 15:06:05 +0900 Subject: [PATCH] mv dictionary to resources directory --- .../pykakasi => resources}/itaijidict2.pickle | Bin .../pykakasi => resources}/kanwadict2.db | Bin src/calibre/ebooks/unihandecode/pykakasi/jisyo.py | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename {src/calibre/ebooks/unihandecode/pykakasi => resources}/itaijidict2.pickle (100%) rename {src/calibre/ebooks/unihandecode/pykakasi => resources}/kanwadict2.db (100%) diff --git a/src/calibre/ebooks/unihandecode/pykakasi/itaijidict2.pickle b/resources/itaijidict2.pickle similarity index 100% rename from src/calibre/ebooks/unihandecode/pykakasi/itaijidict2.pickle rename to resources/itaijidict2.pickle diff --git a/src/calibre/ebooks/unihandecode/pykakasi/kanwadict2.db b/resources/kanwadict2.db similarity index 100% rename from src/calibre/ebooks/unihandecode/pykakasi/kanwadict2.db rename to resources/kanwadict2.db diff --git a/src/calibre/ebooks/unihandecode/pykakasi/jisyo.py b/src/calibre/ebooks/unihandecode/pykakasi/jisyo.py index 7f336a6273..8f86ef437c 100644 --- a/src/calibre/ebooks/unihandecode/pykakasi/jisyo.py +++ b/src/calibre/ebooks/unihandecode/pykakasi/jisyo.py @@ -7,6 +7,8 @@ import anydbm,marshal from zlib import decompress import os +from calibre.utils.resources import resources + class jisyo (object): kanwadict = None itaijidict = None @@ -14,10 +16,10 @@ class jisyo (object): def __init__(self): if self.kanwadict is None: - dictpath = os.path.join('calibre','ebooks','unihandecode','pykakasi','kanwadict2.db') + dictpath = resources.get_path('kanwadict2.db') self.kanwadict = anydbm.open(dictpath,'r') if self.itaijidict is None: - itaijipath = os.path.join('calibre','ebooks','unihandecode','pykakasi','itaijidict2.pickle') + itaijipath = resources.get_path('itaijidict2.pickle') itaiji_pkl = open(itaijipath, 'rb') self.itaijidict = load(itaiji_pkl)