|
14 | 14 | import requests |
15 | 15 | import xmltodict |
16 | 16 |
|
17 | | -from weixin.helper import smart_str, smart_unicode, md5_constructor as md5 |
| 17 | +from weixin.helper import smart_bytes, smart_unicode, md5_constructor as md5 |
18 | 18 |
|
19 | 19 | TIMEOUT = 5 |
20 | 20 |
|
@@ -49,9 +49,9 @@ def params_filter(params, delimiter='&', charset='utf-8', |
49 | 49 | charset = params['input_charset'] |
50 | 50 | for k in ks: |
51 | 51 | v = params[k] |
52 | | - k = smart_str(k, charset) |
| 52 | + k = smart_bytes(k, charset) |
53 | 53 | if k not in excludes and v != '': |
54 | | - newparams[k] = smart_str(v, charset) |
| 54 | + newparams[k] = smart_bytes(v, charset) |
55 | 55 | prestr += '%s=%s%s' % (k, newparams[k], delimiter) |
56 | 56 | prestr = prestr[:-1] |
57 | 57 | return newparams, prestr |
@@ -112,7 +112,7 @@ def prepare_request(self, method, path, params): |
112 | 112 | newparams = params_encoding(newparams) |
113 | 113 | newparams['sign'] = sign |
114 | 114 | xml_dict = {'xml': newparams} |
115 | | - kwargs['data'] = smart_str(xmltodict.unparse(xml_dict)) |
| 115 | + kwargs['data'] = smart_bytes(xmltodict.unparse(xml_dict)) |
116 | 116 | url = self._full_url(path) |
117 | 117 | if self.mch_cert and self.mch_key: |
118 | 118 | kwargs['cert'] = (self.mch_cert, self.mch_key) |
@@ -318,7 +318,7 @@ def prepare_request(self, method, path, params): |
318 | 318 | newparams = params_encoding(newparams) |
319 | 319 | newparams['sign'] = sign |
320 | 320 | xml_dict = {'xml': newparams} |
321 | | - kwargs['data'] = smart_str(xmltodict.unparse(xml_dict)) |
| 321 | + kwargs['data'] = smart_bytes(xmltodict.unparse(xml_dict)) |
322 | 322 | url = self._full_url(path) |
323 | 323 | if self.mch_cert and self.mch_key: |
324 | 324 | kwargs['cert'] = (self.mch_cert, self.mch_key) |
|
0 commit comments