pull some changes from upstream

This commit is contained in:
Steve Pulec 2013-03-16 11:20:07 -04:00
parent 893b446890
commit 46e31d1ecc

View File

@ -54,13 +54,12 @@ else:
class Py3kObject(object): class Py3kObject(object):
pass def __repr__(self):
# def __repr__(self): ret = self.__str__()
# ret = self.__str__() if PY3:
# if PY3: return ret
# return ret else:
# else: ret.encode('utf-8')
# ret.encode('utf-8')
from datetime import datetime from datetime import datetime
from datetime import timedelta from datetime import timedelta
@ -265,6 +264,7 @@ class fakesock(object):
hostnames = [getattr(i.info, 'hostname', None) for i in HTTPretty._entries.keys()] hostnames = [getattr(i.info, 'hostname', None) for i in HTTPretty._entries.keys()]
self.fd.seek(0) self.fd.seek(0)
try: try:
print("data", data)
requestline, _ = data.split('\r\n', 1) requestline, _ = data.split('\r\n', 1)
method, path, version = parse_requestline(requestline) method, path, version = parse_requestline(requestline)
is_parsing_headers = True is_parsing_headers = True