elie/xbmcbackup
1
0
Fork 0
mirror of https://github.com/robweber/xbmcbackup.git synced 2024-11-15 04:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert dropbox python 2.6 changes

Browse Source
This commit is contained in:
Rob Weber 2017-12-29 13:25:40 -06:00
parent d9d6c1ed42
commit adbf225ea2
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/lib/dropbox/oauth.py
View File

@ -511,9 +511,5 @@ def _params_to_urlencoded(params):
else: else:
return str(o).encode('utf-8') return str(o).encode('utf-8')
#fix for python 2.6 utf8_params = {encode(k): encode(v) for k, v in six.iteritems(params)}
utf8_params = {}
for k,v in six.iteritems(params):
utf8_params[encode(k)] = encode(v)
return url_encode(utf8_params) return url_encode(utf8_params)

37
resources/lib/dropbox/stone_serializers.py
View File

@ -237,12 +237,11 @@ class StoneToPythonPrimitiveSerializer(StoneSerializerBase):
def encode_map(self, validator, value): def encode_map(self, validator, value):
validated_value = validator.validate(value) validated_value = validator.validate(value)
#fix for python 2.6 return {
result = {} self.encode_sub(validator.key_validator, key):
for key, value in validated_value.items(): self.encode_sub(validator.value_validator, value) for
result[self.encode_sub(validator.key_validator,key)] = self.encode_sub(validator.value_validator, value) key, value in validated_value.items()
}
return result
def encode_nullable(self, validator, value): def encode_nullable(self, validator, value):
if value is None: if value is None:
@ -831,12 +830,11 @@ def _decode_list(
if not isinstance(obj, list): if not isinstance(obj, list):
raise bv.ValidationError( raise bv.ValidationError(
'expected list, got %s' % bv.generic_type_name(obj)) 'expected list, got %s' % bv.generic_type_name(obj))
return [
result = [] _json_compat_obj_decode_helper(
for item in obj: data_type.item_validator, item, alias_validators, strict,
result.append(_json_compat_obj_decode_helper(data_type.item_validator, item, alias_validators, strict,old_style, for_msgpack)) old_style, for_msgpack)
for item in obj]
return result
def _decode_map( def _decode_map(
@ -848,12 +846,15 @@ def _decode_map(
if not isinstance(obj, dict): if not isinstance(obj, dict):
raise bv.ValidationError( raise bv.ValidationError(
'expected dict, got %s' % bv.generic_type_name(obj)) 'expected dict, got %s' % bv.generic_type_name(obj))
return {
result = {} _json_compat_obj_decode_helper(
for key, value in obj.items(): data_type.key_validator, key, alias_validators, strict,
result[_json_compat_obj_decode_helper(data_type.key_validator, key, alias_validators, strict,old_style, for_msgpack)] = _json_compat_obj_decode_helper(data_type.value_validator, value, alias_validators, strict,old_style, for_msgpack) old_style, for_msgpack):
_json_compat_obj_decode_helper(
return result data_type.value_validator, value, alias_validators, strict,
old_style, for_msgpack)
for key, value in obj.items()
}
def _decode_nullable( def _decode_nullable(

11
resources/lib/dropbox/stone_validators.py
View File

@ -422,13 +422,10 @@ class Map(Composite):
def validate(self, val): def validate(self, val):
if not isinstance(val, dict): if not isinstance(val, dict):
raise ValidationError('%r is not a valid dict' % val) raise ValidationError('%r is not a valid dict' % val)
return {
#fix for python 2.6 self.key_validator.validate(key):
result = {} self.value_validator.validate(value) for key, value in val.items()
for key, value in val.items(): }
result[self.key_validator.validate(key)] = self.value_validator.validate(value)
return result
class Struct(Composite): class Struct(Composite):