Merge lp:~achiang/laika/no-laikarc into lp:laika

[Alex Chiang]

  Handle lack of .laikarc properly

  If the user does not have a ~/.laikarc, the following error is displayed:

   Error: unsupported configuration file format

  and laika exits.

  This is improper behavior. Laika should gracefully use the built-in
  defaults if the user does not have a .laikarc.

  Remove the has_section check, as it causes us to exit prematurely.
  Instead, rewrite the try..except block more generally, so that on
  any exception (either a ConfigParser.NoOptionError or
  ConfigParser.NoSectionError), we fall back to the defaults.

  Fixes LP: #676112

[Florian Boucault (fboucault)]

Works for me. Thanks Alex.

review: Approve

=== modified file 'laika'
--- laika	2010-11-09 14:24:28 +0000
+++ laika	2010-11-16 16:46:17 +0000
@@ -195,10 +195,6 @@
     laika_config = ConfigParser.ConfigParser()
     laika_config.read(os.path.expanduser("~/.laikarc"))
 
-    if laika_config.has_section(FORMAT) == False:
-        print "Error: unsupported configuration file format"
-        sys.exit()
-
     def default_user():
         return os.getenv("USER")
     def default_window():
@@ -209,7 +205,7 @@
     for opt in opts:
         try:
             config[opt] = laika_config.get(FORMAT, opt)
-        except ConfigParser.NoOptionError:
+        except: 
             config[opt] = locals()["default_%s" % opt]()
 
     return config