Changeset 5191

Timestamp:

14/04/09 15:52:39 (12 years ago)

Author:

spascoe

Message:

Removed fallback of looking for NAPPY_BASE_DIR to find nappy.ini because it is inconsistent with the egg layout. Now only NAPPY_ANNOTATIONS and NAPPY_LOCAL_ATTRIBUTES are the only configuration hooks.

File:

• nappy/trunk/nappy/utils/parse_config.py (modified) (1 diff)

nappy/trunk/nappy/utils/parse_config.py

@@ -14 +14 @@
 # Global variables
 
-# base_dir is taken from the environment first and then from nappy.config
-# as a fallback.
-if 'NAPPY_BASE_DIR' in os.environ:
-    base_dir = os.environ["NAPPY_BASE_DIR"]
-else:
-    _here = os.path.dirname(__file__)
-    base_dir = os.path.join(_here, '../config')
+# Defaults are always loaded from <nappy-egg>/nappy/config/nappy.ini
+_here = os.path.dirname(__file__)
+base_dir = os.path.join(_here, '../config')
 
 config_file = os.path.join(base_dir, "nappy.ini")