Commit 44ae87ce authored by Tres Seaver's avatar Tres Seaver

'ZPublisher.Test.publish' now takes a 'done_string' argument.

o The value  is written to standard error when the request completes (forward
  ported from 2.7 branch).
parent fad3a13a
...@@ -26,6 +26,10 @@ Zope Changes ...@@ -26,6 +26,10 @@ Zope Changes
Bugs Fixed Bugs Fixed
- 'ZPublisher.Test.publish' now takes a 'done_string' argument, which
is written to standard error when the request completes (forward
ported from Zope 2.7 branch).
- Collector #556: <dtml-sqlvar> now returns 'null' instead of 'None' - Collector #556: <dtml-sqlvar> now returns 'null' instead of 'None'
for values which are None in Python (sponsored by a bounty from for values which are None in Python (sponsored by a bounty from
Logicalware). Logicalware).
......
...@@ -94,12 +94,13 @@ $Id$ ...@@ -94,12 +94,13 @@ $Id$
''' '''
__version__='$Revision: 1.41 $'[11:-2] __version__='$Revision: 1.41 $'[11:-2]
DONE_STRING_DEFAULT = '\n%s\n\n' % ('_'*60)
import sys, traceback, profile, os, getopt import sys, traceback, profile, os, getopt
from time import clock from time import clock
repeat_count=100 repeat_count=100
TupleType=type(()) TupleType=type(())
def main(): def main():
import sys, os, getopt import sys, os, getopt
global repeat_count global repeat_count
...@@ -240,7 +241,7 @@ defaultModule='Main' ...@@ -240,7 +241,7 @@ defaultModule='Main'
def publish(script=None,path_info='/', def publish(script=None,path_info='/',
u=None,p=None,d=None,t=None,e=None,s=None,pm=0, u=None,p=None,d=None,t=None,e=None,s=None,pm=0,
extra=None, request_method='GET', extra=None, request_method='GET',
fp=None, fp=None, done_string=DONE_STRING_DEFAULT,
stdin=sys.stdin): stdin=sys.stdin):
profile=p profile=p
...@@ -367,7 +368,7 @@ def publish(script=None,path_info='/', ...@@ -367,7 +368,7 @@ def publish(script=None,path_info='/',
elif pm: elif pm:
stdout=sys.stdout stdout=sys.stdout
publish_module_pm(file, environ=env, stdout=stdout, extra=extra) publish_module_pm(file, environ=env, stdout=stdout, extra=extra)
print '\n%s\n' % ('_'*60) sys.stderr.write(done_string)
else: else:
if silent: if silent:
stdout=open('/dev/null','w') stdout=open('/dev/null','w')
...@@ -378,6 +379,6 @@ def publish(script=None,path_info='/', ...@@ -378,6 +379,6 @@ def publish(script=None,path_info='/',
stdout=sys.stdout stdout=sys.stdout
publish_module(file, environ=env, stdout=stdout, extra=extra) publish_module(file, environ=env, stdout=stdout, extra=extra)
print '\n%s\n' % ('_'*60) sys.stderr.write(done_string)
if __name__ == "__main__": main() if __name__ == "__main__": main()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment