/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/__init__.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 16:23:15 UTC
  • mfrom: (170 trunk)
  • mto: (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315162315-rs1sbxjh31n314zc
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
931
931
 
932
932
class Preferences:
933
933
    """ A class which handles Olive's preferences. """
934
 
    def __init__(self, filename=None):
 
934
    def __init__(self, path=None):
935
935
        """ Initialize the Preferences class. """
936
936
        # Some default options
937
937
        self.defaults = { 'strict_commit' : False,
944
944
 
945
945
        # Create a config parser object
946
946
        self.config = ConfigParser.RawConfigParser()
947
 
        
 
947
 
948
948
        # Set filename
949
 
        if filename is None:
 
949
        if path is None:
950
950
            if sys.platform == 'win32':
951
951
                # Windows - no dotted files
952
952
                self._filename = os.path.expanduser('~/olive.conf')
953
953
            else:
954
954
                self._filename = os.path.expanduser('~/.olive.conf')
955
955
        else:
956
 
            self._filename = filename
 
956
            self._filename = path
957
957
        
958
958
        # Load the configuration
959
959
        self.read()