[CMF-checkins] SVN: CMF/branches/tseaver-pkg_resources/C Don't register skin directories when being imported by the testrunner without 'Products' in our package name.

[Tres Seaver]

Log message for revision 39677:
  Don't register skin directories when being imported by the testrunner without 'Products' in our package name.
  
  

Changed:
  U   CMF/branches/tseaver-pkg_resources/CHANGES.txt
  U   CMF/branches/tseaver-pkg_resources/CMFActionIcons/__init__.py
  U   CMF/branches/tseaver-pkg_resources/CMFCalendar/__init__.py
  U   CMF/branches/tseaver-pkg_resources/CMFDefault/__init__.py
  U   CMF/branches/tseaver-pkg_resources/CMFTopic/__init__.py

-=-
Modified: CMF/branches/tseaver-pkg_resources/CHANGES.txt
===================================================================
--- CMF/branches/tseaver-pkg_resources/CHANGES.txt	2005-10-27 17:35:27 UTC (rev 39676)
+++ CMF/branches/tseaver-pkg_resources/CHANGES.txt	2005-10-27 18:17:21 UTC (rev 39677)
@@ -136,6 +136,10 @@
 
   Others
 
+    - {CMFCalendar,CMFActionIcons,CMFDefault,CMFTopic}/__init__.py:
+      Don't register skin directories when being imported by the testrunner
+      without 'Products' in our package name.
+
     - CMFCore.DirectoryView:  Dropped long-deprecated support for '.security'
       and '.properties' files;  use the all-singing, all-dancing '.metadata'
       file instead.

Modified: CMF/branches/tseaver-pkg_resources/CMFActionIcons/__init__.py
===================================================================
--- CMF/branches/tseaver-pkg_resources/CMFActionIcons/__init__.py	2005-10-27 17:35:27 UTC (rev 39676)
+++ CMF/branches/tseaver-pkg_resources/CMFActionIcons/__init__.py	2005-10-27 18:17:21 UTC (rev 39677)
@@ -29,7 +29,8 @@
 
 actionicons_globals = globals()
 
-registerDirectory( 'skins', actionicons_globals )
+if __name__.startswith('Products'):  # testrunner may import w/o 'Products'
+    registerDirectory('skins', actionicons_globals)
 
 def initialize( context ):
 

Modified: CMF/branches/tseaver-pkg_resources/CMFCalendar/__init__.py
===================================================================
--- CMF/branches/tseaver-pkg_resources/CMFCalendar/__init__.py	2005-10-27 17:35:27 UTC (rev 39676)
+++ CMF/branches/tseaver-pkg_resources/CMFCalendar/__init__.py	2005-10-27 18:17:21 UTC (rev 39677)
@@ -42,7 +42,8 @@
 event_globals=globals()
 
 # Make the skins available as DirectoryViews
-registerDirectory('skins', globals())
+if __name__.startswith('Products'):  # testrunner may import w/o 'Products'
+    registerDirectory('skins', globals())
 
 def initialize( context ):
     utils.ToolInit('CMF Calendar Tool', tools=tools, icon='tool.gif',

Modified: CMF/branches/tseaver-pkg_resources/CMFDefault/__init__.py
===================================================================
--- CMF/branches/tseaver-pkg_resources/CMFDefault/__init__.py	2005-10-27 17:35:27 UTC (rev 39676)
+++ CMF/branches/tseaver-pkg_resources/CMFDefault/__init__.py	2005-10-27 18:17:21 UTC (rev 39677)
@@ -90,8 +90,9 @@
 cmfdefault_globals=globals()
 
 # Make the skins available as DirectoryViews.
-registerDirectory('skins', globals())
-registerDirectory('help', globals())
+if __name__.startswith('Products'):  # testrunner may import w/o 'Products'
+    registerDirectory('skins', globals())
+    registerDirectory('help', globals())
 
 def initialize( context ):
 

Modified: CMF/branches/tseaver-pkg_resources/CMFTopic/__init__.py
===================================================================
--- CMF/branches/tseaver-pkg_resources/CMFTopic/__init__.py	2005-10-27 17:35:27 UTC (rev 39676)
+++ CMF/branches/tseaver-pkg_resources/CMFTopic/__init__.py	2005-10-27 18:17:21 UTC (rev 39677)
@@ -45,7 +45,8 @@
 topic_globals = globals()
 
 # Make the skins available as DirectoryViews
-registerDirectory( 'skins', globals() )
+if __name__.startswith('Products'):  # testrunner may import w/o 'Products'
+    registerDirectory( 'skins', globals() )
 
 def initialize( context ):