[gnue] r7021 - trunk/gnue-forms/src/uidrivers/_base

[reinhard]

Author: reinhard
Date: 2005-02-13 12:08:10 -0600 (Sun, 13 Feb 2005)
New Revision: 7021

Modified:
   trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
Log:
Fixed warning generated for all .pyc files and for .svn directory.


Modified: trunk/gnue-forms/src/uidrivers/_base/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2005-02-13 15:45:06 UTC 
(rev 7020)
+++ trunk/gnue-forms/src/uidrivers/_base/UIdriver.py    2005-02-13 18:08:10 UTC 
(rev 7021)
@@ -141,17 +141,18 @@
     basedir +='/widgets/'
     for widgetName in dircache.listdir (basedir):
       try:
-        if widgetName [0] != '_':
-          if os.path.isfile (basedir + widgetName) and \
-             os.path.splitext (widgetName) [1] == ".py":
-            widgetName = os.path.splitext(widgetName)[0]
+        # _xxx are abstract classes, .xxx are hidden dirs (like ".svn")
+        if widgetName [0] != '_' and widgetName [0] != '.':
+          if os.path.isdir (basedir + widgetName):
+            # Directories: import as module
             widget = dyn_import ('gnue.forms.uidrivers.%s.widgets.%s' \
                                  % (uiDriver, widgetName))
-          elif os.path.isdir (basedir + widgetName):
-            widget = dyn_import ('gnue.forms.uidrivers.%s.widgets.%s' \
-                                 % (uiDriver, widgetName))
-          else:
-            raise ImportError, "How the fsck did I get here?"
+          elif os.path.isfile (basedir + widgetName):
+            # Files: import only .py (not .pyc or .pyo or anything else)
+            (widgetName, ext) = os.path.splitext (widgetName)
+            if ext == '.py':
+              widget = dyn_import ('gnue.forms.uidrivers.%s.widgets.%s' \
+                                   % (uiDriver, widgetName))
 
           try:
             self._supportedWidgets [widget.configuration ['provides']] = widget