Browse Source

Remove nilmdb.utils.urllib

python-requests seems to handle UTF-8 just fine.
tags/nilmdb-1.2
Jim Paris 11 years ago
parent
commit
68bbbf757d
2 changed files with 0 additions and 38 deletions
  1. +0
    -1
      nilmdb/utils/__init__.py
  2. +0
    -37
      nilmdb/utils/urllib.py

+ 0
- 1
nilmdb/utils/__init__.py View File

@@ -6,6 +6,5 @@ from nilmdb.utils.serializer import serializer_proxy
from nilmdb.utils.lrucache import lru_cache
from nilmdb.utils.diskusage import du, human_size
from nilmdb.utils.mustclose import must_close
from nilmdb.utils.urllib import urlencode
from nilmdb.utils import atomic
import nilmdb.utils.threadsafety

+ 0
- 37
nilmdb/utils/urllib.py View File

@@ -1,37 +0,0 @@
from __future__ import absolute_import
from urllib import quote_plus, _is_unicode

# urllib.urlencode insists on encoding Unicode as ASCII. This is based
# on that function, except we always encode it as UTF-8 instead.

def urlencode(query):
"""Encode a dictionary into a URL query string.

If any values in the query arg are sequences, each sequence
element is converted to a separate parameter.
"""

query = query.items()

l = []
for k, v in query:
k = quote_plus(str(k))
if isinstance(v, str):
v = quote_plus(v)
l.append(k + '=' + v)
elif _is_unicode(v):
v = quote_plus(v.encode("utf-8","strict"))
l.append(k + '=' + v)
else:
try:
# is this a sufficient test for sequence-ness?
len(v)
except TypeError:
# not a sequence
v = quote_plus(str(v))
l.append(k + '=' + v)
else:
# loop over the sequence
for elt in v:
l.append(k + '=' + quote_plus(str(elt)))
return '&'.join(l)

Loading…
Cancel
Save