From 84d9a1b577b69bcf5af18c232990b5a9c7d4dec3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 13 Mar 2012 16:39:51 -0700 Subject: [PATCH 1/2] dict_to_sequence --- requests/sessions.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/requests/sessions.py b/requests/sessions.py index 87320d6e..7ed8fa5e 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -16,6 +16,15 @@ from .utils import header_expand from .packages.urllib3.poolmanager import PoolManager +def dict_to_sequence(d): + """Returns an internal sequence dictionary update.""" + + if hasattr(d, 'items'): + d = d.items() + + return d + + def merge_kwargs(local_kwarg, default_kwarg): """Merges kwarg dictionaries. From 0dd6c4020535bbd45f25580dae5037b77cc1b707 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 13 Mar 2012 16:42:16 -0700 Subject: [PATCH 2/2] dict sequence --- requests/sessions.py | 3 +++ requests/utils.py | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/requests/sessions.py b/requests/sessions.py index 7ed8fa5e..04d7d5dd 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -31,6 +31,9 @@ def merge_kwargs(local_kwarg, default_kwarg): If a local key in the dictionary is set to None, it will be removed. """ + + + if default_kwarg is None: return local_kwarg diff --git a/requests/utils.py b/requests/utils.py index 6952a996..4c94c661 100644 --- a/requests/utils.py +++ b/requests/utils.py @@ -14,7 +14,6 @@ import codecs import os import random import re -import traceback import zlib from netrc import netrc, NetrcParseError @@ -26,6 +25,15 @@ from .compat import basestring, bytes, str NETRC_FILES = ('.netrc', '_netrc') +def dict_to_sequence(d): + """Returns an internal sequence dictionary update.""" + + if hasattr(d, 'items'): + d = d.items() + + return d + + def get_netrc_auth(url): """Returns the Requests tuple auth for a given url from netrc."""