~mwhudson/twisted/session-2710-9

« back to all changes in this revision

Viewing changes to twisted/web/server.py

  • Committer: exarkun
  • Date: 2009-04-14 12:52:15 UTC
  • Revision ID: svn-v4:bbbe8e31-12d6-0310-92fd-ac37d47ddeeb:trunk:26701
Revert r26700 - new test fails on Python 2.3

Reopens #3697

On Python 2.3, dict.update does not accept a list of two-tuples, so the new test fails
when it passes such a list to dict.update:

{{{
[ERROR]: twisted.web.test.test_distrib.DistribTest.test_requestHeaders

Traceback (most recent call last):
  File "/srv/bb-slave/Run/slave/full2.3/Twisted/twisted/spread/pb.py", line 840, in _recvMessage
    netResult = object.remoteMessageReceived(self, message, netArgs, netKw)
  File "/srv/bb-slave/Run/slave/full2.3/Twisted/twisted/spread/flavors.py", line 114, in remoteMessageReceived
    state = method(*args, **kw)
  File "/srv/bb-slave/Run/slave/full2.3/Twisted/twisted/web/distrib.py", line 198, in remote_request
    return res.render(request)
  File "/srv/bb-slave/Run/slave/full2.3/Twisted/twisted/web/test/test_distrib.py", line 93, in render
    requestHeaders.update(
exceptions.AttributeError: keys
}}}

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
import string
15
15
import types
16
16
import copy
 
17
import time
17
18
import os
18
19
from urllib import quote
19
20
 
80
81
        x['host'] = _addressToTuple(x['host'])
81
82
        x['client'] = _addressToTuple(x['client'])
82
83
 
83
 
        # Header objects also aren't jellyable.
84
 
        x['requestHeaders'] = list(x['requestHeaders'].getAllRawHeaders())
85
 
 
86
84
        return x
87
85
 
88
86
    # HTML generation helpers