remove cruft

This commit is contained in:
Kenneth Reitz
2012-03-13 16:44:45 -07:00
parent 0dd6c40205
commit 29309201b6

View File

@@ -16,24 +16,12 @@ 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.
If a local key in the dictionary is set to None, it will be removed.
"""
if default_kwarg is None:
return local_kwarg