瀏覽代碼

Merge branch 'improve-ctk-init'

* improve-ctk-init:
  BUG: Allow ctk to be imported if neither Core or Widget kit are loaded
Jean-Christophe Fillion-Robin 10 年之前
父節點
當前提交
e23537d146
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      Libs/Scripting/Python/Core/Python/ctk/__init__.py.in

+ 4 - 2
Libs/Scripting/Python/Core/Python/ctk/__init__.py.in

@@ -6,9 +6,11 @@ __kits_to_load = [ @CTK_PYTHON_WRAPPED_LIBRARIES@ ]
 # Set to True when debugging
 _CTK_VERBOSE_IMPORT = False
 
+kits = []
 for kit in __kits_to_load:
   try:
     exec "from CTK%sPythonQt import *" % (kit)
+    kits.append(kit)
   except ImportError as detail:
     if _CTK_VERBOSE_IMPORT:
       print detail
@@ -88,11 +90,11 @@ def decorates_ctkWorkflowWidgetStep_initialize_method():
 # Decorators
 #
 
-_lib = next((_lib for _lib in __kits_to_load if _lib == 'Core'), None)
+_lib = next((_lib for _lib in kits if _lib == 'Core'), None)
 if _lib == 'Core':
   add_methodclass_to_ctkWorkflowStep_or_ctkWorkflowWidgetStep(ctkWorkflowStep)
 
-_lib = next((_lib for _lib in __kits_to_load if _lib == 'Widgets'), None)
+_lib = next((_lib for _lib in kits if _lib == 'Widgets'), None)
 if _lib == 'Widgets':
   add_methodclass_to_ctkWorkflowStep_or_ctkWorkflowWidgetStep(ctkWorkflowWidgetStep)
   add_methodclass_to_ctkWorkflowWidgetStep()