← 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: Matt Giuca
  • Date: 2009-02-24 02:02:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1119.
  • Revision ID: matt.giuca@gmail.com-20090224020203-aqdcjnsj6y7wl32o
Added a new look to the IVLE header bar. Mmmm... Web 2.0.
Added top-level directory image-source, containing SVG and script files for
    generating the images.
ivle/webapp/coremedia/images: Added 'chrome' directory containing the rendered
    images.
Modified ivle/webapp/base/ivle-headings.html and
    ivle/webapp/coremedia/ivle.css to support the new images.
    Note that the H1 and H2 at the top of the page are no longer displayed
    (and their custom styles have been removed). There is a heading image
    instead.

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())