removed some more beta9 code
authorThomas Schmidt <tschmidt@debian.org>
Fri, 16 Oct 2009 20:41:32 +0000 (22:41 +0200)
committerThomas Schmidt <tschmidt@debian.org>
Fri, 16 Oct 2009 20:41:32 +0000 (22:41 +0200)
canola-flickr/flickr/options.py

index c437f32..3a300ae 100644 (file)
@@ -35,15 +35,8 @@ from manager import FlickrManager
 manager = Manager()
 flickr_manager = FlickrManager()
 
-ModalController = manager.get_class("Controller/Modal")
-
-try:
-    # beta10 way to get ModalMessage
-    ModalMessage = manager.get_class("Widget/Settings/ModalMessage")
-except ValueError:
-    # beta9 way to get ModalMessage
-    from terra.ui.modal import ModalMessage
-
+ModalController         = manager.get_class("Controller/Modal")
+ModalMessage            = manager.get_class("Widget/Settings/ModalMessage")
 BasicPanel              = manager.get_class("Controller/BasicPanel")
 BaseScrollableText      = manager.get_class("Widget/ScrollableTextBlock")
 ControllerOptionsFolder = manager.get_class("Controller/Options/Folder")