Changeset 1327

Show
Ignore:
Timestamp:
05/11/08 12:11:10 (2 months ago)
Author:
klattimer
Message:

Tidy up

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • wine-doors/branches/0.2/src/log.py

    r1323 r1327  
    9393        sys.stdout.write( message ) 
    9494        sys.stdout.flush() 
     95 
     96if __name__ == "__main__": 
     97    print "Unit testing: Log" 
  • wine-doors/branches/0.2/src/preferences.py

    r1326 r1327  
    7171            else: 
    7272                preferences_file = "/etc/wine-doors/preferences.xml" 
     73                self.Load( preferences_file ) 
    7374                if not os.path.isfile( preferences_file ): 
    7475                    os.system( "mkdir -p " + os.path.expanduser( "~/.wine-doors" ) ) 
     
    118119        self.preferences = {} 
    119120 
    120     def Load( self ): 
     121    def Load( self, preferences_file=None ): 
    121122        """ 
    122123        Load the preferences.xml file which is found in the <wine root>/wine-doors/ 
    123124        """ 
     125        if not preferences_file and self.preferences_file: 
     126            preferences_file = self.preferences_file 
     127        else: 
     128            return 
     129 
    124130        temp_repos = [] 
    125131        handler = ParsePreferences( self.preferences, temp_repos ) 
    126132        parser = make_parser() 
    127133        parser.setContentHandler( handler ) 
    128         parser.parse( self.preferences_file ) 
     134        parser.parse( preferences_file ) 
    129135 
    130136        for name, src, username, password in temp_repos: 
     
    170176    for key, value in preferences.preferences.iteritems(): 
    171177        print key, ' = ', value 
    172     print 
     178 
     179    print "------------------------------------------------" 
    173180    print "Repositories:" 
    174181    for name, src, username, password in preferences.repositories: 
    175182        print "Repository, name: " + name + " URI: " + src 
    176     print 
     183    print "------------------------------------------------" 
    177184    print "Testing load/save:" 
    178185    print "Setting name to \"testing\"" 
     
    181188    preferences.Save() 
    182189    preferences.Reset() 
    183     print "Saved
    184     print 
     190    print "Saving
     191    print "------------------------------------------------" 
    185192    print "Loading" 
    186193    preferences.Load() 
    187194    print "preferences['name'] = " + preferences['name'] 
    188195    preferences["name"] = oldpref 
     196    print "Reverting" 
    189197    preferences.Save()