[Zope3-checkins] SVN: Zope3/branches/3.3/ Refactor the way we check
for no developer mode: use the new
Philipp von Weitershausen
philikon at philikon.de
Fri Aug 18 06:19:41 EDT 2006
Log message for revision 69639:
Refactor the way we check for no developer mode: use the new
not-have verb in zcml:condition.
Changed:
D Zope3/branches/3.3/ftesting-nodevmode.zcml
U Zope3/branches/3.3/src/zope/app/apidoc/browser/ftests.py
U Zope3/branches/3.3/src/zope/app/apidoc/configure.zcml
U Zope3/branches/3.3/src/zope/app/server/main.py
U Zope3/branches/3.3/src/zope/app/twisted/main.py
U Zope3/branches/3.3/src/zope/app/wsgi/__init__.py
-=-
Deleted: Zope3/branches/3.3/ftesting-nodevmode.zcml
===================================================================
--- Zope3/branches/3.3/ftesting-nodevmode.zcml 2006-08-18 10:15:09 UTC (rev 69638)
+++ Zope3/branches/3.3/ftesting-nodevmode.zcml 2006-08-18 10:19:40 UTC (rev 69639)
@@ -1,12 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta"
- i18n_domain="zope"
- >
-
- <!-- Turn off the devmode -->
- <meta:provides feature="nodevmode" />
-
- <include file="ftesting-base.zcml" />
-
-</configure>
Modified: Zope3/branches/3.3/src/zope/app/apidoc/browser/ftests.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/apidoc/browser/ftests.py 2006-08-18 10:15:09 UTC (rev 69638)
+++ Zope3/branches/3.3/src/zope/app/apidoc/browser/ftests.py 2006-08-18 10:19:40 UTC (rev 69639)
@@ -65,7 +65,7 @@
NoDevModeLayer = zope.app.testing.functional.ZCMLLayer(
- "ftesting-nodevmode.zcml",
+ "ftesting-base.zcml",
__name__,
"NoDevModeLayer")
Modified: Zope3/branches/3.3/src/zope/app/apidoc/configure.zcml
===================================================================
--- Zope3/branches/3.3/src/zope/app/apidoc/configure.zcml 2006-08-18 10:15:09 UTC (rev 69638)
+++ Zope3/branches/3.3/src/zope/app/apidoc/configure.zcml 2006-08-18 10:19:40 UTC (rev 69639)
@@ -10,7 +10,7 @@
/>
<include
- zcml:condition="have nodevmode"
+ zcml:condition="not-have devmode"
file="disabled.zcml"
/>
Modified: Zope3/branches/3.3/src/zope/app/server/main.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/server/main.py 2006-08-18 10:15:09 UTC (rev 69638)
+++ Zope3/branches/3.3/src/zope/app/server/main.py 2006-08-18 10:19:40 UTC (rev 69639)
@@ -105,8 +105,6 @@
logging.warning("Developer mode is enabled: this is a security risk "
"and should NOT be enabled on production servers. Developer mode "
"can be turned off in etc/zope.conf")
- else:
- features += ('nodevmode',)
zope.app.appsetup.config(options.site_definition, features=features)
Modified: Zope3/branches/3.3/src/zope/app/twisted/main.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/twisted/main.py 2006-08-18 10:15:09 UTC (rev 69638)
+++ Zope3/branches/3.3/src/zope/app/twisted/main.py 2006-08-18 10:19:40 UTC (rev 69639)
@@ -136,8 +136,6 @@
logging.warning("Developer mode is enabled: this is a security risk "
"and should NOT be enabled on production servers. Developer mode "
"can be turned off in etc/zope.conf")
- else:
- features += ('nodevmode',)
zope.app.appsetup.config(options.site_definition, features=features)
Modified: Zope3/branches/3.3/src/zope/app/wsgi/__init__.py
===================================================================
--- Zope3/branches/3.3/src/zope/app/wsgi/__init__.py 2006-08-18 10:15:09 UTC (rev 69638)
+++ Zope3/branches/3.3/src/zope/app/wsgi/__init__.py 2006-08-18 10:19:40 UTC (rev 69639)
@@ -123,8 +123,6 @@
logging.warning("Developer mode is enabled: this is a security risk "
"and should NOT be enabled on production servers. Developer mode "
"can be turned off in etc/zope.conf")
- else:
- features += ('nodevmode',)
# Configure the application
appsetup.config(options.site_definition, features=features)
More information about the Zope3-Checkins
mailing list