openstack/swift
Code Issues Proposed changes

Merge "Python3 eventlet patched httplib _MAXHEADERS"

Browse Source
This commit is contained in:
Jenkins
2016-07-25 17:55:32 +00:00
committed by Gerrit Code Review
parent 574a666a43 26d91f2b10
commit 53bf2e4e50
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
swift/common/bufferedhttp.py
View File

@@ -38,7 +38,10 @@ from eventlet.green.httplib import CONTINUE, HTTPConnection, HTTPMessage, \
from six.moves.urllib.parse import quote from six.moves.urllib.parse import quote
import six import six
httplib = eventlet.import_patched('httplib') if six.PY2:
httplib = eventlet.import_patched('httplib')
else:
httplib = eventlet.import_patched('http.client')
httplib._MAXHEADERS = constraints.MAX_HEADER_COUNT httplib._MAXHEADERS = constraints.MAX_HEADER_COUNT

2
swift/common/middleware/copy.py
View File

@@ -132,7 +132,7 @@ backwards compatibility. At first chance, set ``object_post_as_copy`` to
""" """
import os import os
from ConfigParser import ConfigParser, NoSectionError, NoOptionError from six.moves.configparser import ConfigParser, NoSectionError, NoOptionError
from six.moves.urllib.parse import quote, unquote from six.moves.urllib.parse import quote, unquote
from swift.common import utils from swift.common import utils

4
test/probe/test_wsgi_servers.py
View File

@@ -15,9 +15,11 @@
# limitations under the License. # limitations under the License.
import unittest import unittest
import httplib
import random import random
from six.moves import http_client as httplib
from swift.common.storage_policy import POLICIES from swift.common.storage_policy import POLICIES
from swift.common.ring import Ring from swift.common.ring import Ring
from swift.common.manager import Manager from swift.common.manager import Manager