This commit is contained in:
Tom Christie 2012-12-19 22:05:00 +00:00
parent ab86990ac8
commit d90d5380d7

View File

@ -444,19 +444,19 @@ class CacheRenderTest(TestCase):
return return
if state == None: if state == None:
return return
if isinstance(state,tuple): if isinstance(state, tuple):
if not isinstance(state[0],dict): if not isinstance(state[0], dict):
state=state[1] state = state[1]
else: else:
state=state[0].update(state[1]) state = state[0].update(state[1])
result = {} result = {}
for i in state: for i in state:
try: try:
pickle.dumps(state[i],protocol=2) pickle.dumps(state[i], protocol=2)
except pickle.PicklingError: except pickle.PicklingError:
if not state[i] in seen: if not state[i] in seen:
seen.append(state[i]) seen.append(state[i])
result[i] = cls._get_pickling_errors(state[i],seen) result[i] = cls._get_pickling_errors(state[i], seen)
return result return result
def http_resp(self, http_method, url): def http_resp(self, http_method, url):