Changeset 5191 for nappy/trunk


Ignore:
Timestamp:
14/04/09 15:52:39 (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • nappy/trunk/nappy/utils/parse_config.py

    r5142 r5191  
    1414# Global variables 
    1515 
    16 # base_dir is taken from the environment first and then from nappy.config 
    17 # as a fallback. 
    18 if 'NAPPY_BASE_DIR' in os.environ: 
    19     base_dir = os.environ["NAPPY_BASE_DIR"] 
    20 else: 
    21     _here = os.path.dirname(__file__) 
    22     base_dir = os.path.join(_here, '../config') 
     16# Defaults are always loaded from <nappy-egg>/nappy/config/nappy.ini 
     17_here = os.path.dirname(__file__) 
     18base_dir = os.path.join(_here, '../config') 
    2319 
    2420config_file = os.path.join(base_dir, "nappy.ini") 
Note: See TracChangeset for help on using the changeset viewer.