mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Replace basestring with str
This commit is contained in:
parent
75419c1f04
commit
832b1224b9
@ -247,9 +247,9 @@ def read_config(opts, config_file='config.py'):
|
||||
config[k] = clean_description(config[k])
|
||||
|
||||
if 'serverwebroot' in config:
|
||||
if isinstance(config['serverwebroot'], basestring):
|
||||
if isinstance(config['serverwebroot'], str):
|
||||
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']
|
||||
else:
|
||||
raise TypeError('only accepts strings, lists, and tuples')
|
||||
|
@ -862,7 +862,7 @@ def post_metadata_parse(app):
|
||||
build.__dict__[k] = re.sub(esc_newlines, '', v).lstrip().rstrip()
|
||||
elif ftype == TYPE_BOOL:
|
||||
# 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)
|
||||
elif ftype == TYPE_STRING:
|
||||
if isinstance(v, bool) and v:
|
||||
@ -901,7 +901,7 @@ def post_metadata_parse(app):
|
||||
|
||||
|
||||
def _decode_list(data):
|
||||
'''convert items in a list from unicode to basestring'''
|
||||
'''convert items in a list from unicode to str'''
|
||||
rv = []
|
||||
for item in data:
|
||||
if isinstance(item, unicode):
|
||||
@ -915,7 +915,7 @@ def _decode_list(data):
|
||||
|
||||
|
||||
def _decode_dict(data):
|
||||
'''convert items in a dict from unicode to basestring'''
|
||||
'''convert items in a dict from unicode to str'''
|
||||
rv = {}
|
||||
for k, v in data.items():
|
||||
if isinstance(k, unicode):
|
||||
|
Loading…
Reference in New Issue
Block a user