mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace basestring with str

Browse source
This commit is contained in:
Daniel Martí 2016-01-04 17:03:42 +01:00
parent 75419c1f04
commit 832b1224b9
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/common.py
View file

@ -247,9 +247,9 @@ def read_config(opts, config_file='config.py'):
config[k] = clean_description(config[k]) config[k] = clean_description(config[k])
if 'serverwebroot' in config: if 'serverwebroot' in config:
if isinstance(config['serverwebroot'], basestring): if isinstance(config['serverwebroot'], str):
roots = [config['serverwebroot']] roots = [config['serverwebroot']]
elif all(isinstance(item, basestring) for item in config['serverwebroot']): elif all(isinstance(item, str) for item in config['serverwebroot']):
roots = config['serverwebroot'] roots = config['serverwebroot']
else: else:
raise TypeError('only accepts strings, lists, and tuples') raise TypeError('only accepts strings, lists, and tuples')

6
fdroidserver/metadata.py
View file

@ -862,7 +862,7 @@ def post_metadata_parse(app):
build.__dict__[k] = re.sub(esc_newlines, '', v).lstrip().rstrip() build.__dict__[k] = re.sub(esc_newlines, '', v).lstrip().rstrip()
elif ftype == TYPE_BOOL: elif ftype == TYPE_BOOL:
# TODO handle this using <xsd:element type="xsd:boolean> in a schema # TODO handle this using <xsd:element type="xsd:boolean> in a schema
if isinstance(v, basestring): if isinstance(v, str):
build.__dict__[k] = _decode_bool(v) build.__dict__[k] = _decode_bool(v)
elif ftype == TYPE_STRING: elif ftype == TYPE_STRING:
if isinstance(v, bool) and v: if isinstance(v, bool) and v:
@ -901,7 +901,7 @@ def post_metadata_parse(app):
def _decode_list(data): def _decode_list(data):
'''convert items in a list from unicode to basestring''' '''convert items in a list from unicode to str'''
rv = [] rv = []
for item in data: for item in data:
if isinstance(item, unicode): if isinstance(item, unicode):
@ -915,7 +915,7 @@ def _decode_list(data):
def _decode_dict(data): def _decode_dict(data):
'''convert items in a dict from unicode to basestring''' '''convert items in a dict from unicode to str'''
rv = {} rv = {}
for k, v in data.items(): for k, v in data.items():
if isinstance(k, unicode): if isinstance(k, unicode):