Merge lp:~cwilson/spud/window_open_bugfix into lp:spud

[Cian Wilson]

Fixes sloppy indentation in diamond/bin/diamond

[Patrick Farrell (pefarrell)]

I don't understand the monster that diamond/bin/diamond has become, but I trust you, Cian!

review: Approve

[Cian Wilson (cwilson)]

Thanks Patrick!

I don't understand it at all either but just looking at the diff for r533 its pretty clear that the try/except went in at the wrong indentation level.

=== modified file 'diamond/bin/diamond'
--- diamond/bin/diamond	2012-09-22 15:00:03 +0000
+++ diamond/bin/diamond	2012-10-12 21:02:20 +0000
@@ -273,11 +273,11 @@
   else:
     plugins.configure_plugins(suffix)
 
-  try:
-    i = interface.Diamond(gladefile = gladefile, logofile = logofile, suffix = suffix)
-  except Exception, e:
-    debug.deprint('Error: ' + str(e), 0)
-    i = interface.Diamond(gladefile = gladefile, suffix = suffix)
+    try:
+      i = interface.Diamond(gladefile = gladefile, logofile = logofile, suffix = suffix)
+    except Exception, e:
+      debug.deprint('Error: ' + str(e), 0)
+      i = interface.Diamond(gladefile = gladefile, suffix = suffix)
 
     i.main_window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
     i.open_file(schemafile = input_schemafile, filename = input_filename)