[Zope3-checkins] SVN: Zope3/trunk/ Fixed #112109: Returning 200 Ok
instead of 200 OK
Dmitry Vasiliev
dima at hlabs.spb.ru
Thu May 3 13:18:24 EDT 2007
Log message for revision 75062:
Fixed #112109: Returning 200 Ok instead of 200 OK
Changed:
U Zope3/trunk/doc/CHANGES.txt
U Zope3/trunk/src/zope/app/authentication/browser/group_searching_with_empty_string.txt
U Zope3/trunk/src/zope/app/authentication/browser/groupfolder.txt
U Zope3/trunk/src/zope/app/authentication/browser/pau_prefix_and_searching.txt
U Zope3/trunk/src/zope/app/authentication/browser/principalfolder.txt
U Zope3/trunk/src/zope/app/authentication/browser/special-groups.txt
U Zope3/trunk/src/zope/app/demo/widget/help/boolwidget.txt
U Zope3/trunk/src/zope/app/demo/widget/help/intwidget.txt
U Zope3/trunk/src/zope/app/demo/widget/help/textareawidget.txt
U Zope3/trunk/src/zope/app/demo/widget/help/textwidget.txt
U Zope3/trunk/src/zope/app/dtmlpage/url.txt
U Zope3/trunk/src/zope/app/file/browser/file.txt
U Zope3/trunk/src/zope/app/file/browser/url.txt
U Zope3/trunk/src/zope/app/form/browser/i18n.txt
U Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.txt
U Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.txt
U Zope3/trunk/src/zope/app/publication/httpfactory.txt
U Zope3/trunk/src/zope/app/securitypolicy/browser/granting_ftest.txt
U Zope3/trunk/src/zope/app/testing/doctest.txt
U Zope3/trunk/src/zope/app/testing/recorded/test0001.response
U Zope3/trunk/src/zope/app/testing/recorded/test0002.response
U Zope3/trunk/src/zope/app/testing/tests.py
U Zope3/trunk/src/zope/app/xmlrpcintrospection/README.txt
U Zope3/trunk/src/zope/app/zptpage/browser/collector266.txt
U Zope3/trunk/src/zope/app/zptpage/browser/collector269.txt
U Zope3/trunk/src/zope/app/zptpage/browser/url.txt
U Zope3/trunk/src/zope/publisher/http.py
U Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py
U Zope3/trunk/src/zope/publisher/tests/test_http.py
U Zope3/trunk/src/zope/publisher/xmlrpc.py
U Zope3/trunk/src/zope/server/http/httptask.py
U Zope3/trunk/src/zope/testbrowser/README.txt
-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/doc/CHANGES.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -22,6 +22,8 @@
Bugs fixed
+ - #112109: Returning 200 Ok instead of 200 OK
+
- Added a fallback unauthenticated principal that is stored on the
request if the global authentication utility does not provide one.
Modified: Zope3/trunk/src/zope/app/authentication/browser/group_searching_with_empty_string.txt
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/group_searching_with_empty_string.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/authentication/browser/group_searching_with_empty_string.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -167,7 +167,7 @@
... Z3JvdXBz
... -----------------------------1786480431902757372789659730--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -184,7 +184,7 @@
... "field.principal.MC5ncm91cHM_.field.search=&"
... "field.principal.MC5ncm91cHM_.search=Search&"
... "field.principal.MQ__.searchstring=")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...Test1...Test2...
We get both of our groups in the result.
Modified: Zope3/trunk/src/zope/app/authentication/browser/groupfolder.txt
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/groupfolder.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/authentication/browser/groupfolder.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -33,7 +33,7 @@
... Cookie: zope3_cs_6a553b3=-j7C3CdeW9sUK8BP5x97u2d9o242xMJDzJd8HCQ5AAi9xeFcGTFkAs
... Referer: http://localhost:8081/++etc++site/default/@@contents.html?type_name=BrowserAdd__zope.app.authentication.authentication.PluggableAuthentication
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Register PAU.
@@ -458,7 +458,7 @@
... Z3JvdXBz
... -----------------------------2026736768606413562109112352--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -545,7 +545,7 @@
...
... -----------------------------6981402699601872602121555350--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -627,7 +627,7 @@
... Change
... -----------------------------181944013812647128322134918391--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Now, with these groups set up, we should see these groups on the
Modified: Zope3/trunk/src/zope/app/authentication/browser/pau_prefix_and_searching.txt
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/pau_prefix_and_searching.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/authentication/browser/pau_prefix_and_searching.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -211,7 +211,7 @@
... VXNlcnM=
... -----------------------------610310492754--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Now we'll use the 'grant' interface of the root folder to search for all of
@@ -228,7 +228,7 @@
... "field.principal.MC5Hcm91cHM_.search=Search&"
... "field.principal.MC5Vc2Vycw__.field.search=&"
... "field.principal.MQ__.searchstring=")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<select name="field.principal.MC5Hcm91cHM_.selection">
<option value="cGF1MV9ncm91cHNfbmljZQ__">Nice People</option>
@@ -253,7 +253,7 @@
... "field.principal.MC5Vc2Vycw__.field.search=&"
... "field.principal.MC5Vc2Vycw__.search=Search&"
... "field.principal.MQ__.searchstring=")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<select name="field.principal.MC5Vc2Vycw__.selection">
<option value="cGF1MV91c2Vyc18x">Bob</option>
Modified: Zope3/trunk/src/zope/app/authentication/browser/principalfolder.txt
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/principalfolder.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/authentication/browser/principalfolder.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -39,7 +39,7 @@
... Cookie: zope3_cs_6a553b3=-j7C3CdeW9sUK8BP5x97u2d9o242xMJDzJd8HCQ5AAi9xeFcGTFkAs
... Referer: http://localhost:8081/++etc++site/default/@@contents.html?type_name=BrowserAdd__zope.app.authentication.authentication.PluggableAuthentication
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Register PAU.
@@ -105,7 +105,7 @@
... Cookie: zope3_cs_6a553b3=-j7C3CdeW9sUK8BP5x97u2d9o242xMJDzJd8HCQ5AAi9xeFcGTFkAs
... Referer: http://localhost:8081/++etc++site/default/PAU/users/addRegistration.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -200,7 +200,7 @@
... dXNlcnM=
... -----------------------------6519411471194050603270010787--
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Now, with this in place, Bob can log in, but he isn't allowed to
@@ -236,7 +236,7 @@
... Cookie: zope3_cs_6a58ae0=zt1tvSi4JRxMD4bggPyUqMA70iE3bgAqvQB.y.ZeOhMmkfbens3-pU
... Referer: http://localhost:8081/@@contents.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
>>> print http(r"""
@@ -248,7 +248,7 @@
... Referer: http://localhost:8081/@@grant.html
...
... field.principal.displayed=y&field.principal.MC51c2Vycw__.query.field.search=&field.principal.MC51c2Vycw__.selection=dXNlcnNib2I_&field.principal.MC51c2Vycw__.apply=Apply&field.principal.MQ__.query.searchstring=""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -261,7 +261,7 @@
... Referer: http://localhost:8081/@@grant.html
...
... field.principal.displayed=y&field.principal.MC51c2Vycw__.query.field.search=&field.principal.MC51c2Vycw__.selection=dXNlcnNib2I_&field.principal.MC51c2Vycw__.apply=Apply&field.principal.MQ__.query.searchstring=""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -281,7 +281,7 @@
... """&GRANT_SUBMIT=Change"""
... """&field.dXNlcnMuMQ__.role.zope.Manager=allow"""
... """&field.dXNlcnMuMQ__.role.zope.Manager-empty-marker=1""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -294,7 +294,7 @@
... Referer: http://localhost:8081/@@grant.html
...
... field.principal=dXNlcnNib2I_&field.principal.displayed=y&field.principal.MC51c2Vycw__.query.field.search=&field.principal.MQ__.query.searchstring=&GRANT_SUBMIT=Change&field.dXNlcnNib2I_.role.bugtracker.Admin=unset&field.dXNlcnNib2I_.role.bugtracker.Editor=unset&field.dXNlcnNib2I_.role.bugtracker.User=unset&field.dXNlcnNib2I_.role.zope.Anonymous=unset&field.dXNlcnNib2I_.role.zope.Manager=allow&field.dXNlcnNib2I_.role.zope.Member=unset&field.dXNlcnNib2I_.role.zwiki.Admin=unset&field.dXNlcnNib2I_.role.zwiki.Editor=unset&field.dXNlcnNib2I_.role.zwiki.User=unset&field.dXNlcnNib2I_.permission.bugtracker.AddBug=unset&field.dXNlcnNib2I_.permission.bugtracker.AddAttachment=unset&field.dXNlcnNib2I_.permission.bugtracker.AddComment=unset&field.dXNlcnNib2I_.permission.zwiki.AddWikiPage=unset&field.dXNlcnNib2I_.permission.zwiki.CommentWikiPage=unset&field.dXNlcnNib2I_.permission.zwiki.DeleteWikiPage=unset&field.dXNlcnNib2I_.permission.bugtracker.EditBug=unset&field.dXNlcnNib2I_.permission.zwiki.EditWikiPage=unset&field.dXNlcnNib2I_.permission.bugtracker.ManageBugTracker=unset&field.dXNlcnNib2I_.permission.zwiki.ReparentWikiPage=unset&field.dXNlcnNib2I_.permission.bugtracker.ViewBug=unset&field.dXNlcnNib2I_.permission.bugtracker.ViewBugTracker=unset&field.dXNlcnNib2I_.permission.zwiki.ViewWikiPage=unset&field.dXNlcnNib2I_.permission.zope.AddImages=unset&field.dXNlcnNib2I_.permission.zope.AddSQLScripts=unset&field.dXNlcnNib2I_.permission.zope.Security=unset&field.dXNlcnNib2I_.permission.zope.workflow.CreateProcessInstances=unset&field.dXNlcnNib2I_.permission.zope.ManageApplication=unset&field.dXNlcnNib2I_.permission.zope.ManageCode=unset&field.dXNlcnNib2I_.permission.zope.ManageContent=unset&field.dXNlcnNib2I_.permission.zope.ManagePrincipals=unset&field.dXNlcnNib2I_.permission.zope.ManageBindings=unset&field.dXNlcnNib2I_.permission.zope.ManageServices=unset&field.dXNlcnNib2I_.permission.zope.ManageSite=unset&field.dXNlcnNib2I_.permission.zope.workflow.ManageProcessDefinitions=unset&field.dXNlcnNib2I_.permission.zope.SendMail=unset&field.dXNlcnNib2I_.permission.zope.UndoAllTransactions=unset&field.dXNlcnNib2I_.permission.zope.UndoOwnTransactions=unset&field.dXNlcnNib2I_.permission.zope.workflow.UseProcessInstances=unset&field.dXNlcnNib2I_.permission.zope.View=unset&field.dXNlcnNib2I_.permission.zope.app.apidoc.UseAPIDoc=unset&field.dXNlcnNib2I_.permission.zope.app.dublincore.change=unset&field.dXNlcnNib2I_.permission.zope.app.dublincore.view=unset&field.dXNlcnNib2I_.permission.zope.app.introspector.Introspect=unset&field.dXNlcnNib2I_.permission.zope.app.rdb.Use=unset""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -304,5 +304,5 @@
... GET /@@contents.html HTTP/1.1
... Authorization: Basic Ym9iOjEyMw==
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Modified: Zope3/trunk/src/zope/app/authentication/browser/special-groups.txt
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/special-groups.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/authentication/browser/special-groups.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -162,7 +162,7 @@
... dXNlcnM=
... -----------------------------6519411471194050603270010787--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Normally, the anonymous role has view, we'll deny it:
@@ -176,7 +176,7 @@
... """&Deny%3Alist=zope.View"""
... """&Deny%3Alist=zope.app.dublincore.view"""
... """&SUBMIT_ROLE=Save+Changes""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Now, if we try to access the main page as an anonymous user,
@@ -218,7 +218,7 @@
... """&field.em9wZS5BdXRoZW50aWNhdGVk.permission.zope.View=allow"""
... """&field.em9wZS5BdXRoZW50aWNhdGVk.permission.zope.app.dublincore.view=allow"""
... """&GRANT_SUBMIT=Change""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Now, with this, we can access the main page as bob, but not as an
@@ -228,13 +228,13 @@
... GET / HTTP/1.1
... Authorization: Basic bob:123
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
>>> print http(r"""
... GET / HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
###401 Unauthorized
@@ -252,7 +252,7 @@
... """&field.em9wZS5Bbnlib2R5.permission.zope.View=allow"""
... """&field.em9wZS5Bbnlib2R5.permission.zope.app.dublincore.view=allow"""
... """&GRANT_SUBMIT=Change""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
With this, we can access the page as either bob or anonymous:
@@ -261,13 +261,13 @@
... GET / HTTP/1.1
... Authorization: Basic bob:123
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
>>> print http(r"""
... GET / HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
@@ -282,7 +282,7 @@
... """&field.em9wZS5BdXRoZW50aWNhdGVk.permission.zope.View=unset"""
... """&field.em9wZS5BdXRoZW50aWNhdGVk.permission.zope.app.dublincore.view=unset"""
... """&GRANT_SUBMIT=Change""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
And anonymous people will be able to access the page, but bob won't be able to:
@@ -322,7 +322,7 @@
... """&field.em9wZS5Bbnlib2R5.permission.zope.View=unset"""
... """&field.em9wZS5Bbnlib2R5.permission.zope.app.dublincore.view=unset"""
... """&GRANT_SUBMIT=Change""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
>>> print http(r"""
@@ -357,7 +357,7 @@
... """&field.em9wZS5FdmVyeWJvZHk_.permission.zope.View=allow"""
... """&field.em9wZS5FdmVyeWJvZHk_.permission.zope.app.dublincore.view=allow"""
... """&GRANT_SUBMIT=Change""", handle_errors = False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
and both bob nor anonymous can access:
@@ -366,11 +366,11 @@
... GET / HTTP/1.1
... Authorization: Basic bob:123
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
>>> print http(r"""
... GET / HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Modified: Zope3/trunk/src/zope/app/demo/widget/help/boolwidget.txt
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/help/boolwidget.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/demo/widget/help/boolwidget.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -203,7 +203,7 @@
... Authorization: Basic mgr:mgrpw
... Referer: http://localhost:8081/widgets/demo/@@contents.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<div class="row">
<div class="label">
@@ -232,4 +232,4 @@
title="zope.schema.Bool field with default = True.">default</label>
</div>
<div class="field"><input class="hiddenType" id="field.default.used" name="field.default.used" type="hidden" value="" /> <input class="checkboxType" checked="checked" id="field.default" name="field.default" type="checkbox" value="on" /></div>
- </div...
\ No newline at end of file
+ </div...
Modified: Zope3/trunk/src/zope/app/demo/widget/help/intwidget.txt
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/help/intwidget.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/demo/widget/help/intwidget.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -239,7 +239,7 @@
... Authorization: Basic mgr:mgrpw
... Referer: http://localhost:8081/widgets/42/@@index.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<div class="row">
<div class="label">
Modified: Zope3/trunk/src/zope/app/demo/widget/help/textareawidget.txt
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/help/textareawidget.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/demo/widget/help/textareawidget.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -207,7 +207,7 @@
... Authorization: Basic mgr:mgrpw
... Referer: http://localhost:8081/widgets/textarea/@@index.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<div class="row">
<div class="label">
Modified: Zope3/trunk/src/zope/app/demo/widget/help/textwidget.txt
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/help/textwidget.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/demo/widget/help/textwidget.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -239,7 +239,7 @@
... Authorization: Basic mgr:mgrpw
... Referer: http://localhost:8081/widgets/demo/@@contents.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<div class="row">
<div class="label">
Modified: Zope3/trunk/src/zope/app/dtmlpage/url.txt
===================================================================
--- Zope3/trunk/src/zope/app/dtmlpage/url.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/dtmlpage/url.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -40,7 +40,7 @@
... GET /dtml.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<html>
<head></head>
@@ -55,7 +55,7 @@
... GET /dtml.html/ HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<html>
<head>
Modified: Zope3/trunk/src/zope/app/file/browser/file.txt
===================================================================
--- Zope3/trunk/src/zope/app/file/browser/file.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/file/browser/file.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -10,7 +10,7 @@
... GET /@@contents.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -45,7 +45,7 @@
... GET /+/zope.app.file.File= HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -116,7 +116,7 @@
... GET /hello.txt.gz HTTP/1.1
... """)
>>> print response
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 36
Content-Type: application/octet-stream
<BLANKLINE>
@@ -169,7 +169,7 @@
>>> print http("""
... GET /sample.txt HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 0
Content-Type: text/plain
Last-Modified: ...
@@ -181,7 +181,7 @@
... GET /sample.txt/edit.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -230,7 +230,7 @@
... Change
... -----------------------------165727764114325486311042046845--
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -267,7 +267,7 @@
>>> print http(r"""
... GET /sample.txt HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/plain
Last-Modified: ...
@@ -304,7 +304,7 @@
... Change
... -----------------------------165727764114325486311042046845--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -342,7 +342,7 @@
... GET /sample.txt HTTP/1.1
... """)
>>> print response
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/plain
Last-Modified: ...
@@ -378,7 +378,7 @@
... Change
... -----------------------------165727764114325486311042046845--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -416,7 +416,7 @@
... GET /sample.txt HTTP/1.1
... """)
>>> print response
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/plain; charset=ISO-8859-1
Last-Modified: ...
@@ -455,7 +455,7 @@
... Change
... -----------------------------165727764114325486311042046845--
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -509,7 +509,7 @@
... Change
... -----------------------------165727764114325486311042046845--
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -546,7 +546,7 @@
... GET /hello.txt.gz/@@edit.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -600,7 +600,7 @@
... GET /bj%C3%B6rn.txt.gz HTTP/1.1
... """)
>>> print response
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 36
Content-Type: application/octet-stream
<BLANKLINE>
Modified: Zope3/trunk/src/zope/app/file/browser/url.txt
===================================================================
--- Zope3/trunk/src/zope/app/file/browser/url.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/file/browser/url.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -61,14 +61,14 @@
... Change
... -----------------------------10196264131256436092131136054--
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
>>> print http(r"""
... GET /file.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<html>
<head></head>
@@ -82,7 +82,7 @@
... GET /file.html/ HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<html>
<head>
Modified: Zope3/trunk/src/zope/app/form/browser/i18n.txt
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/i18n.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/form/browser/i18n.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -11,7 +11,7 @@
... GET /+/addfieldcontent.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
with an error...
@@ -44,7 +44,7 @@
...
... -----------------------------19588947601368617292863650127--
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
There are <strong>1</strong> input errors.
...
@@ -60,7 +60,7 @@
... Accept-Language: de
... Authorization: Basic mgr:mgrpw
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...Felderinhalt hinzuf...
...Eine kurz...Titel...
...Eine ausf...Beschreibung...
@@ -102,7 +102,7 @@
...
... -----------------------------19588947601368617292863650127--
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...Felderinhalt hinzuf...
...Ein Fehler ist aufgetreten...
...Es gab <strong>1</strong> Eingabefehler...
Modified: Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.txt
===================================================================
--- Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -32,7 +32,7 @@
... GET /i18nfile/editForm.html?language=en HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<textarea ...>English</textarea>
...
@@ -43,7 +43,7 @@
... GET /i18nfile/index.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
English
@@ -81,7 +81,7 @@
... GET /i18nfile/editForm.html?language=ru HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<textarea ...>Russian</textarea>
...
@@ -93,6 +93,6 @@
... Authorization: Basic mgr:mgrpw
... Accept-Language: ru,en
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
Russian
Modified: Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.txt
===================================================================
--- Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -33,7 +33,7 @@
... GET /i18nimage/upload.html?language=en HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
...>1 KB 20037x20037</...
...
@@ -44,7 +44,7 @@
... GET /i18nimage/ HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 10
Content-Type: image/gif
<BLANKLINE>
@@ -85,7 +85,7 @@
... GET /i18nimage/upload.html?language=ru HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
...>1 KB 21842x21842</...
...
@@ -97,7 +97,7 @@
... Authorization: Basic mgr:mgrpw
... Accept-Language: ru,en
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 10
Content-Type: image/gif
<BLANKLINE>
Modified: Zope3/trunk/src/zope/app/publication/httpfactory.txt
===================================================================
--- Zope3/trunk/src/zope/app/publication/httpfactory.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/publication/httpfactory.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -13,21 +13,21 @@
>>> print http(r"""
... GET / HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 4322
Content-Type: text/html;charset=utf-8
...
>>> print http(r"""
... POST / HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 4322
Content-Type: text/html;charset=utf-8
...
>>> print http(r"""
... HEAD / HTTP/1.1
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 0
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -38,7 +38,7 @@
... POST /RPC2 HTTP/1.0
... Content-Type: text/xml
... """)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
Content-Length: ...
Content-Type: text/xml;charset=utf-8
...
@@ -53,7 +53,7 @@
... Content-Type: text/xml
... HTTP_SOAPACTION: soap#action
... """)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
Content-Length: ...
Content-Type: text/xml;charset=utf-8
...
Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/granting_ftest.txt
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/granting_ftest.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/granting_ftest.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -12,7 +12,7 @@
... Authorization: Basic mgr:mgrpw
... Referer: http://localhost:8081/@@contents.html
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
If we submit a search request, we'll get a list of principals, from
@@ -28,7 +28,7 @@
... field.principal.displayed=y"""
... "&field.principal.MA__.searchstring="
... "&field.principal.MA__.search=Search")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<option value="em9wZS5tZ3I_">Manager</option>
...
@@ -47,7 +47,7 @@
... """&field.principal.MA__.searchstring="""
... """&field.principal.MA__.selection=em9wZS5tZ3I_"""
... """&field.principal.MA__.apply=Apply""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<td class="">
<center>
@@ -129,7 +129,7 @@
... """&field.em9wZS5tZ3I_.permission.zope.ManageCode=deny"""
... """&field.em9wZS5tZ3I_.permission.zope.ManageCode-empty-marker=1"""
... """&GRANT_SUBMIT=Change""")
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<td class="default">
<center>
Modified: Zope3/trunk/src/zope/app/testing/doctest.txt
===================================================================
--- Zope3/trunk/src/zope/app/testing/doctest.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/testing/doctest.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -45,7 +45,7 @@
... GET /@@contents.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -92,7 +92,7 @@
... Authorization: Basic mgr:mgrpw
... Referer: http://localhost:8081/
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -104,7 +104,7 @@
... GET / HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
<BLANKLINE>
Modified: Zope3/trunk/src/zope/app/testing/recorded/test0001.response
===================================================================
--- Zope3/trunk/src/zope/app/testing/recorded/test0001.response 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/testing/recorded/test0001.response 2007-05-03 17:18:18 UTC (rev 75062)
@@ -14,7 +14,7 @@
</html>
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
X-Content-Type-Warning: guessed from content
Content-Length: 89
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
@@ -37,7 +37,7 @@
Content-Type: text/plain;charset=utf-8
Server: zope.server.http (HTTP)
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
Content-Length: 183
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
Expires: Fri, 13 Aug 2004 10:35:28 GMT
@@ -47,7 +47,7 @@
Date: Fri, 20 Aug 2004 10:35:28 GMT
Content-Type: text/xml;charset=utf-8
-<?xml version="1.0" ?><children> <collection name="" length="0" icon_url="http://localhost:8081/@@/zope-app-folder-interfaces-IFolder-zmi_icon.gif" isroot=""></collection> </children>HTTP/1.1 200 Ok
+<?xml version="1.0" ?><children> <collection name="" length="0" icon_url="http://localhost:8081/@@/zope-app-folder-interfaces-IFolder-zmi_icon.gif" isroot=""></collection> </children>HTTP/1.1 200 OK
Last-Modified: Thu, 19 Aug 2004 10:10:06 GMT
Content-Length: 868
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
@@ -65,7 +65,7 @@
Content-Type: text/plain;charset=utf-8
Server: zope.server.http (HTTP)
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
Last-Modified: Thu, 19 Aug 2004 10:10:04 GMT
Content-Length: 738
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
Modified: Zope3/trunk/src/zope/app/testing/recorded/test0002.response
===================================================================
--- Zope3/trunk/src/zope/app/testing/recorded/test0002.response 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/testing/recorded/test0002.response 2007-05-03 17:18:18 UTC (rev 75062)
@@ -38,7 +38,7 @@
Content-Type: text/plain;charset=utf-8
Server: zope.server.http (HTTP)
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
Content-Length: 183
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
Expires: Fri, 13 Aug 2004 10:35:15 GMT
@@ -56,7 +56,7 @@
Content-Type: text/plain;charset=utf-8
Server: zope.server.http (HTTP)
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
X-Content-Type-Warning: guessed from content
Content-Length: 89
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
@@ -71,7 +71,7 @@
</html>
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
Content-Length: 175
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
Expires: Fri, 13 Aug 2004 10:35:47 GMT
@@ -81,7 +81,7 @@
Date: Fri, 20 Aug 2004 10:35:47 GMT
Content-Type: text/xml;charset=utf-8
-<?xml version="1.0" ?><children> <collection name="++etc++site" length="1" icon_url="http://localhost:8081/@@/zope-app-site-interfaces-ISiteManager-zmi_icon.gif"/> </children>HTTP/1.1 200 Ok
+<?xml version="1.0" ?><children> <collection name="++etc++site" length="1" icon_url="http://localhost:8081/@@/zope-app-site-interfaces-ISiteManager-zmi_icon.gif"/> </children>HTTP/1.1 200 OK
Last-Modified: Thu, 19 Aug 2004 10:09:00 GMT
Content-Length: 932
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
@@ -90,7 +90,7 @@
Content-Type: image/gif
Server: zope.server.http (HTTP)
-GIF89a ÷ NNN¨oÿ ñï¶Wâã*çèEííqíí{‹‹‹îî†îî‡ïï‘ðð›ùâ¼ðð£òòôôÀõõËööÐøøÚùùâúúçúúëúúíýýôþþúÿÿÿ !ù , H° Áƒ(D€p
ÐP ‚ 2 À‘ã‡B6Ð02$D -jÈ€a€† <` `£@rº ÓÁ‚6¸ ¹3d€‚"Àt§Óœ-b°@ahQ¢7/T˜0¡éK¦¢"Шq§Æ¨:ª 6eÅ· ;HTTP/1.1 200 Ok
+GIF89a ÷ NNN¨oÿ ñï¶Wâã*çèEííqíí{‹‹‹îî†îî‡ïï‘ðð›ùâ¼ðð£òòôôÀõõËööÐøøÚùùâúúçúúëúúíýýôþþúÿÿÿ !ù , H° Áƒ(D€p
ÐP ‚ 2 À‘ã‡B6Ð02$D -jÈ€a€† <` `£@rº ÓÁ‚6¸ ¹3d€‚"Àt§Óœ-b°@ahQ¢7/T˜0¡éK¦¢"Шq§Æ¨:ª 6eÅ· ;HTTP/1.1 200 OK
X-Content-Type-Warning: guessed from content
Content-Length: 89
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
@@ -105,7 +105,7 @@
</html>
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
Content-Length: 325
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
Expires: Fri, 13 Aug 2004 10:35:52 GMT
@@ -115,4 +115,4 @@
Date: Fri, 20 Aug 2004 10:35:52 GMT
Content-Type: text/xml;charset=utf-8
-<?xml version="1.0" ?><children> <collection name="" length="0" icon_url="http://localhost:8081/@@/zope-app-folder-interfaces-IFolder-zmi_icon.gif" isroot=""><collection name="++etc++site" length="1" icon_url="http://localhost:8081/@@/zope-app-site-interfaces-ISiteManager-zmi_icon.gif"></collection></collection> </children>
\ No newline at end of file
+<?xml version="1.0" ?><children> <collection name="" length="0" icon_url="http://localhost:8081/@@/zope-app-folder-interfaces-IFolder-zmi_icon.gif" isroot=""><collection name="++etc++site" length="1" icon_url="http://localhost:8081/@@/zope-app-site-interfaces-ISiteManager-zmi_icon.gif"></collection></collection> </children>
Modified: Zope3/trunk/src/zope/app/testing/tests.py
===================================================================
--- Zope3/trunk/src/zope/app/testing/tests.py 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/testing/tests.py 2007-05-03 17:18:18 UTC (rev 75062)
@@ -35,7 +35,7 @@
HEADERS = """\
-HTTP/1.1 200 Ok
+HTTP/1.1 200 OK
Content-Type: text/plain
"""
@@ -70,7 +70,7 @@
... GET /@@contents.html HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 89
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -100,7 +100,7 @@
... GET / HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 89
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -119,7 +119,7 @@
... Authorization: Basic bWdyOm1ncnB3
... Referer: http://localhost:8081/
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 89
Content-Type: text/html;charset=utf-8
<BLANKLINE>
Modified: Zope3/trunk/src/zope/app/xmlrpcintrospection/README.txt
===================================================================
--- Zope3/trunk/src/zope/app/xmlrpcintrospection/README.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/xmlrpcintrospection/README.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -111,7 +111,7 @@
... </params>
... </methodCall>
... """)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
@@ -165,7 +165,7 @@
... </params>
... </methodCall>
... """, handle_errors=False)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
@@ -209,7 +209,7 @@
... </params>
... </methodCall>
... """, handle_errors=False)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
@@ -302,7 +302,7 @@
... </params>
... </methodCall>
... """, handle_errors=False)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
@@ -337,7 +337,7 @@
... </params>
... </methodCall>
... """, handle_errors=False)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
@@ -399,7 +399,7 @@
... </params>
... </methodCall>
... """, handle_errors=False)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
@@ -426,7 +426,7 @@
... </params>
... </methodCall>
... """, handle_errors=False)
- HTTP/1.0 200 Ok
+ HTTP/1.0 200 OK
...
<?xml version='1.0'?>
<methodResponse>
Modified: Zope3/trunk/src/zope/app/zptpage/browser/collector266.txt
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/browser/collector266.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/zptpage/browser/collector266.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -100,7 +100,7 @@
... GET /page HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 52
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -160,7 +160,7 @@
... GET /page2 HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 68
Content-Type: text/html;charset=utf-8
<BLANKLINE>
@@ -221,7 +221,7 @@
... GET /page3 HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 66
Content-Type: text/html;charset=utf-8
<BLANKLINE>
Modified: Zope3/trunk/src/zope/app/zptpage/browser/collector269.txt
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/browser/collector269.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/zptpage/browser/collector269.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -122,7 +122,7 @@
... GET /page HTTP/1.1
... Authorization: Basic bWdyOm1ncnB3
... """, handle_errors=False)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
Content-Length: 119
Content-Type: text/html;charset=utf-8
<BLANKLINE>
Modified: Zope3/trunk/src/zope/app/zptpage/browser/url.txt
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/browser/url.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/app/zptpage/browser/url.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -45,7 +45,7 @@
... GET /zpt.html HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<html>
<head></head>
@@ -60,7 +60,7 @@
... GET /zpt.html/ HTTP/1.1
... Authorization: Basic mgr:mgrpw
... """)
- HTTP/1.1 200 Ok
+ HTTP/1.1 200 OK
...
<html>
<head>
Modified: Zope3/trunk/src/zope/publisher/http.py
===================================================================
--- Zope3/trunk/src/zope/publisher/http.py 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/publisher/http.py 2007-05-03 17:18:18 UTC (rev 75062)
@@ -639,19 +639,12 @@
else:
if type(status) in StringTypes:
status = status.lower()
- if status in status_codes:
- status = status_codes[status]
- else:
- status = 500
+ status = status_codes.get(status, 500)
self._status = status
if reason is None:
- if status == 200:
- reason = 'Ok'
- elif status in status_reasons:
- reason = status_reasons[status]
- else:
- reason = 'Unknown'
+ reason = status_reasons.get(status, "Unknown")
+
self._reason = reason
self._status_set = True
Modified: Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/publisher/tests/test_browserrequest.py 2007-05-03 17:18:18 UTC (rev 75062)
@@ -134,7 +134,7 @@
res = self._publisherResults()
self.failUnlessEqual(
res,
- "Status: 200 Ok\r\n"
+ "Status: 200 OK\r\n"
"Content-Length: 7\r\n"
"Content-Type: text/plain;charset=utf-8\r\n"
"X-Content-Type-Warning: guessed from content\r\n"
Modified: Zope3/trunk/src/zope/publisher/tests/test_http.py
===================================================================
--- Zope3/trunk/src/zope/publisher/tests/test_http.py 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/publisher/tests/test_http.py 2007-05-03 17:18:18 UTC (rev 75062)
@@ -174,7 +174,7 @@
res = self._publisherResults()
self.failUnlessEqual(
res,
- "Status: 200 Ok\r\n"
+ "Status: 200 OK\r\n"
"Content-Length: 6\r\n"
"X-Powered-By: Zope (www.zope.org), Python (www.python.org)\r\n"
"\r\n"
Modified: Zope3/trunk/src/zope/publisher/xmlrpc.py
===================================================================
--- Zope3/trunk/src/zope/publisher/xmlrpc.py 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/publisher/xmlrpc.py 2007-05-03 17:18:18 UTC (rev 75062)
@@ -132,7 +132,7 @@
... resp.handleException(exc_info)
>>> resp.getStatusString()
- '200 Ok'
+ '200 OK'
>>> resp.getHeader('content-type')
'text/xml;charset=utf-8'
>>> body = ''.join(resp.consumeBody())
Modified: Zope3/trunk/src/zope/server/http/httptask.py
===================================================================
--- Zope3/trunk/src/zope/server/http/httptask.py 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/server/http/httptask.py 2007-05-03 17:18:18 UTC (rev 75062)
@@ -44,7 +44,7 @@
instream = None
close_on_finish = 1
status = '200'
- reason = 'Ok'
+ reason = 'OK'
wrote_header = 0
accumulated_headers = None
bytes_written = 0
Modified: Zope3/trunk/src/zope/testbrowser/README.txt
===================================================================
--- Zope3/trunk/src/zope/testbrowser/README.txt 2007-05-03 16:35:32 UTC (rev 75061)
+++ Zope3/trunk/src/zope/testbrowser/README.txt 2007-05-03 17:18:18 UTC (rev 75062)
@@ -137,7 +137,7 @@
The headers can be accessed as a string:
>>> print browser.headers
- Status: 200 Ok
+ Status: 200 OK
Content-Length: ...
Content-Type: text/html;charset=utf-8
X-Powered-By: Zope (www.zope.org), Python (www.python.org)
More information about the Zope3-Checkins
mailing list