← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/config/__init__.py

  • Committer: William Grant
  • Date: 2009-02-27 05:07:09 UTC
  • Revision ID: grantw@unimelb.edu.au-20090227050709-k16kvhyl50nzjbwm
Subject URLs now contain the short name (eg. info1) rather than the code
(eg. 600151).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/config/__init__.py
38
38
 
39
39
def search_confdir():
40
40
    """
41
 
    Search for the config file, and return the directory it is in.
 
41
    Search for the config file, and return it as a filename.
42
42
    1. Environment var IVLECONF (path to directory)
43
 
    2. /etc/ivle
 
43
    2. /etc/ivle/ivle.conf
44
44
    Raises a ConfigError on error.
45
45
    """
46
46
    if 'IVLECONF' in os.environ:
82
82
            confdir = search_confdir()
83
83
            conffile = os.path.join(confdir, 'ivle.conf')
84
84
            super(Config, self).__init__(infile=conffile, configspec=specfile,
85
 
                                         interpolation='template',
86
85
                                         *args, **kwargs)
87
86
            # XXX This doesn't raise errors if it doesn't validate
88
87
            self.validate(Validator())