From 6df3592aedb3b641c58f5ee1771ff8f5e5d0a628 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 2 Nov 2013 19:09:12 -0700
Subject: [PATCH] Removing unnecessary namespace scoping

---
 yomi_base/{lang => }/japanese/__init__.py           |   0
 yomi_base/{lang => }/japanese/data/deinflect.dat    |   0
 .../{lang => }/japanese/data/dict-copyright.txt     |   0
 yomi_base/{lang => }/japanese/data/dict.sqlite      | Bin
 .../{lang => }/japanese/data/kanji-copyright.txt    |   0
 yomi_base/{lang => }/japanese/data/kanji.dat        |   0
 yomi_base/{lang => }/japanese/data/radicals.dat     |   0
 yomi_base/{lang => }/japanese/deinflect.py          |   0
 yomi_base/{lang => }/japanese/dictionary.py         |   0
 yomi_base/{lang => }/japanese/translate.py          |   0
 yomi_base/lang/__init__.py                          |   0
 yomichan.py                                         |   2 +-
 12 files changed, 1 insertion(+), 1 deletion(-)
 rename yomi_base/{lang => }/japanese/__init__.py (100%)
 rename yomi_base/{lang => }/japanese/data/deinflect.dat (100%)
 rename yomi_base/{lang => }/japanese/data/dict-copyright.txt (100%)
 rename yomi_base/{lang => }/japanese/data/dict.sqlite (100%)
 rename yomi_base/{lang => }/japanese/data/kanji-copyright.txt (100%)
 rename yomi_base/{lang => }/japanese/data/kanji.dat (100%)
 rename yomi_base/{lang => }/japanese/data/radicals.dat (100%)
 rename yomi_base/{lang => }/japanese/deinflect.py (100%)
 rename yomi_base/{lang => }/japanese/dictionary.py (100%)
 rename yomi_base/{lang => }/japanese/translate.py (100%)
 delete mode 100644 yomi_base/lang/__init__.py

diff --git a/yomi_base/lang/japanese/__init__.py b/yomi_base/japanese/__init__.py
similarity index 100%
rename from yomi_base/lang/japanese/__init__.py
rename to yomi_base/japanese/__init__.py
diff --git a/yomi_base/lang/japanese/data/deinflect.dat b/yomi_base/japanese/data/deinflect.dat
similarity index 100%
rename from yomi_base/lang/japanese/data/deinflect.dat
rename to yomi_base/japanese/data/deinflect.dat
diff --git a/yomi_base/lang/japanese/data/dict-copyright.txt b/yomi_base/japanese/data/dict-copyright.txt
similarity index 100%
rename from yomi_base/lang/japanese/data/dict-copyright.txt
rename to yomi_base/japanese/data/dict-copyright.txt
diff --git a/yomi_base/lang/japanese/data/dict.sqlite b/yomi_base/japanese/data/dict.sqlite
similarity index 100%
rename from yomi_base/lang/japanese/data/dict.sqlite
rename to yomi_base/japanese/data/dict.sqlite
diff --git a/yomi_base/lang/japanese/data/kanji-copyright.txt b/yomi_base/japanese/data/kanji-copyright.txt
similarity index 100%
rename from yomi_base/lang/japanese/data/kanji-copyright.txt
rename to yomi_base/japanese/data/kanji-copyright.txt
diff --git a/yomi_base/lang/japanese/data/kanji.dat b/yomi_base/japanese/data/kanji.dat
similarity index 100%
rename from yomi_base/lang/japanese/data/kanji.dat
rename to yomi_base/japanese/data/kanji.dat
diff --git a/yomi_base/lang/japanese/data/radicals.dat b/yomi_base/japanese/data/radicals.dat
similarity index 100%
rename from yomi_base/lang/japanese/data/radicals.dat
rename to yomi_base/japanese/data/radicals.dat
diff --git a/yomi_base/lang/japanese/deinflect.py b/yomi_base/japanese/deinflect.py
similarity index 100%
rename from yomi_base/lang/japanese/deinflect.py
rename to yomi_base/japanese/deinflect.py
diff --git a/yomi_base/lang/japanese/dictionary.py b/yomi_base/japanese/dictionary.py
similarity index 100%
rename from yomi_base/lang/japanese/dictionary.py
rename to yomi_base/japanese/dictionary.py
diff --git a/yomi_base/lang/japanese/translate.py b/yomi_base/japanese/translate.py
similarity index 100%
rename from yomi_base/lang/japanese/translate.py
rename to yomi_base/japanese/translate.py
diff --git a/yomi_base/lang/__init__.py b/yomi_base/lang/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/yomichan.py b/yomichan.py
index 6842e32..ac5bf39 100755
--- a/yomichan.py
+++ b/yomichan.py
@@ -19,7 +19,7 @@
 
 import sys
 from PyQt4 import QtGui, QtCore
-from yomi_base.lang import japanese
+from yomi_base import japanese
 from yomi_base.preference_data import Preferences
 from yomi_base.reader import MainWindowReader