[Zope-Checkins] CVS: Zope/lib/python/Products/PythonScripts - PythonScript.py:1.43 Utility.py:1.6 __init__.py:1.13 module_access_examples.py:1.3 standard.py:1.9
Martijn Pieters
mj@zope.com
Wed, 14 Aug 2002 18:25:39 -0400
Update of /cvs-repository/Zope/lib/python/Products/PythonScripts
In directory cvs.zope.org:/tmp/cvs-serv27658/PythonScripts
Modified Files:
PythonScript.py Utility.py __init__.py
module_access_examples.py standard.py
Log Message:
Clean up indentation and trailing whitespace.
=== Zope/lib/python/Products/PythonScripts/PythonScript.py 1.42 => 1.43 ===
--- Zope/lib/python/Products/PythonScripts/PythonScript.py:1.42 Fri Apr 12 11:37:13 2002
+++ Zope/lib/python/Products/PythonScripts/PythonScript.py Wed Aug 14 18:25:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Python Scripts Product
@@ -153,11 +153,11 @@
"""Replace the body of the script with the text in file."""
if self.wl_isLocked():
raise ResourceLockedError, "The script is locked via WebDAV."
-
- if type(file) is not type(''):
+
+ if type(file) is not type(''):
if not file: raise ValueError, 'File not specified'
file = file.read()
-
+
self.write(file)
message = 'Saved changes.'
return self.ZPythonScriptHTML_editForm(self, REQUEST,
@@ -183,7 +183,7 @@
"""Parameters to test the script with."""
param_names = []
for name in self._params.split(','):
-
+
name = name.strip()
if name and name[0] != '*' and re.match('\w',name):
param_names.append(name.split('=', 1)[0])
@@ -201,7 +201,7 @@
getattr(self, 'Script_magic', None) != Script_magic):
global _log_complaint
if _log_complaint:
- LOG(self.meta_type, INFO, _log_complaint)
+ LOG(self.meta_type, INFO, _log_complaint)
_log_complaint = 0
# Changes here won't get saved, unless this Script is edited.
body = self._body.rstrip()
@@ -329,7 +329,7 @@
if user is not None and user.allowed(self, roles):
return
raise 'Forbidden', ('You are not authorized to change <em>%s</em> '
- 'because you do not have proxy roles.\n<!--%s, %s-->'
+ 'because you do not have proxy roles.\n<!--%s, %s-->'
% (self.id, user, roles))
security.declareProtected('Change proxy roles',
@@ -358,7 +358,7 @@
self.dav__simpleifhandler(REQUEST, RESPONSE, refresh=1)
self.write(REQUEST.get('BODY', ''))
RESPONSE.setStatus(204)
- return RESPONSE
+ return RESPONSE
manage_FTPput = PUT
@@ -449,7 +449,7 @@
hlines = ['%s %s "%s"' % (prefix, self.meta_type, self.id)]
mm = self._metadata_map().items()
mm.sort()
- for kv in mm:
+ for kv in mm:
hlines.append('%s=%s' % kv)
if self.errors:
hlines.append('')
=== Zope/lib/python/Products/PythonScripts/Utility.py 1.5 => 1.6 ===
--- Zope/lib/python/Products/PythonScripts/Utility.py:1.5 Fri Jan 11 12:14:29 2002
+++ Zope/lib/python/Products/PythonScripts/Utility.py Wed Aug 14 18:25:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Utility module for making simple security assertions for
Python scripts."""
=== Zope/lib/python/Products/PythonScripts/__init__.py 1.12 => 1.13 ===
--- Zope/lib/python/Products/PythonScripts/__init__.py:1.12 Thu Jun 20 10:48:38 2002
+++ Zope/lib/python/Products/PythonScripts/__init__.py Wed Aug 14 18:25:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
__doc__='''Python Scripts Product Initialization
$Id$'''
@@ -43,7 +43,7 @@
global _m
_m['recompile'] = recompile
_m['recompile__roles__'] = ('Manager',)
-
+
# utility stuff
def recompile(self):
=== Zope/lib/python/Products/PythonScripts/module_access_examples.py 1.2 => 1.3 ===
--- Zope/lib/python/Products/PythonScripts/module_access_examples.py:1.2 Fri Jan 11 12:14:29 2002
+++ Zope/lib/python/Products/PythonScripts/module_access_examples.py Wed Aug 14 18:25:08 2002
@@ -65,8 +65,3 @@
# 'error_reply', 'error_temp', 'error_perm', 'error_proto')
# from httplib import NNTP
# allow_class(NNTP)
-
-
-
-
-
=== Zope/lib/python/Products/PythonScripts/standard.py 1.8 => 1.9 ===
--- Zope/lib/python/Products/PythonScripts/standard.py:1.8 Wed Aug 14 11:46:58 2002
+++ Zope/lib/python/Products/PythonScripts/standard.py Wed Aug 14 18:25:08 2002
@@ -1,14 +1,14 @@
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Python Scripts standard utility module
@@ -53,4 +53,3 @@
finally: security.removeContext(self)
security.apply(globals())
-