From 6e9295154a3ff59e5c56f1ec044e57b2e8afd126 Mon Sep 17 00:00:00 2001 From: Al Date: Tue, 14 Apr 2015 15:46:15 -0400 Subject: [PATCH] [fix] local dirs for cldr data --- scripts/geodata/i18n/cldr_languages.py | 2 +- scripts/geodata/i18n/download_cldr.py | 2 +- scripts/geodata/i18n/unicode_paths.py | 10 ++++++++++ scripts/geodata/i18n/unicode_scripts.py | 6 +++--- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 scripts/geodata/i18n/unicode_paths.py diff --git a/scripts/geodata/i18n/cldr_languages.py b/scripts/geodata/i18n/cldr_languages.py index 38f35f16..644810fb 100644 --- a/scripts/geodata/i18n/cldr_languages.py +++ b/scripts/geodata/i18n/cldr_languages.py @@ -8,7 +8,7 @@ from collections import Counter from cStringIO import StringIO from lxml import etree -from geodata.i18n.unicode_data import CLDR_DIR +from unicode_paths import CLDR_DIR this_dir = os.path.realpath(os.path.dirname(__file__)) DEFAULT_LANGUAGES_DIR = os.path.join(os.pardir, os.pardir, os.pardir, diff --git a/scripts/geodata/i18n/download_cldr.py b/scripts/geodata/i18n/download_cldr.py index 25e66179..9105061f 100644 --- a/scripts/geodata/i18n/download_cldr.py +++ b/scripts/geodata/i18n/download_cldr.py @@ -4,7 +4,7 @@ import subprocess import sys import tempfile -from cldr_data import CLDR_DIR +from unicode_paths import CLDR_DIR this_dir = os.path.realpath(os.path.dirname(__file__)) sys.path.append(os.path.realpath(os.path.join(os.pardir, os.pardir))) diff --git a/scripts/geodata/i18n/unicode_paths.py b/scripts/geodata/i18n/unicode_paths.py new file mode 100644 index 00000000..c54627ff --- /dev/null +++ b/scripts/geodata/i18n/unicode_paths.py @@ -0,0 +1,10 @@ +import os +import sys + +this_dir = os.path.realpath(os.path.dirname(__file__)) +sys.path.append(os.path.realpath(os.path.join(os.pardir, os.pardir))) + +UNICODE_DATA_DIR = os.path.join(this_dir, os.pardir, os.pardir, os.pardir, + 'data', 'unicode') + +CLDR_DIR = os.path.join(UNICODE_DATA_DIR, 'cldr') diff --git a/scripts/geodata/i18n/unicode_scripts.py b/scripts/geodata/i18n/unicode_scripts.py index fce08f98..39de3ed2 100644 --- a/scripts/geodata/i18n/unicode_scripts.py +++ b/scripts/geodata/i18n/unicode_scripts.py @@ -30,9 +30,9 @@ sys.path.append(os.path.realpath(os.path.join(os.pardir, os.pardir))) from geodata.encoding import safe_encode, safe_decode from geodata.file_utils import ensure_dir -from geodata.i18n.cldr_languages import * -from geodata.i18n.unicode_data import UNICODE_DATA_DIR -from geodata.i18n.word_breaks import script_regex, regex_char_range +from cldr_languages import * +from unicode_paths import UNICODE_DATA_DIR +from word_breaks import script_regex, regex_char_range SCRIPTS_DATA_DIR = os.path.join(UNICODE_DATA_DIR, 'scripts') LOCAL_SCRIPTS_FILE = os.path.join(SCRIPTS_DATA_DIR, 'Scripts.txt')