kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity

Work around encoding issues when using xml files

Browse Source 
The xml package returns "unicode" objects instead of strings in utf-8.
This commit is contained in:
Daniel Martí 2015-06-03 18:42:24 +02:00
parent dd37061b41
commit cd93d23062
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/common.py
View File

@ -882,7 +882,7 @@ def retrieve_string(app_dir, string, xmlfiles=None):
xml = parse_xml(path) xml = parse_xml(path)
element = xml.find('string[@name="' + name + '"]') element = xml.find('string[@name="' + name + '"]')
if element is not None: if element is not None:
return retrieve_string(app_dir, element.text, xmlfiles) return retrieve_string(app_dir, element.text.encode('utf-8'), xmlfiles)
return '' return ''
@ -915,7 +915,7 @@ def fetch_real_name(app_dir, flavours):
app = xml.find('application') app = xml.find('application')
if "{http://schemas.android.com/apk/res/android}label" not in app.attrib: if "{http://schemas.android.com/apk/res/android}label" not in app.attrib:
continue continue
label = app.attrib["{http://schemas.android.com/apk/res/android}label"] label = app.attrib["{http://schemas.android.com/apk/res/android}label"].encode('utf-8')
result = retrieve_string(app_dir, label) result = retrieve_string(app_dir, label)
if result: if result:
result = result.strip() result = result.strip()
@ -1020,11 +1020,11 @@ def parse_androidmanifests(paths, ignoreversions=None):
else: else:
xml = parse_xml(path) xml = parse_xml(path)
if "package" in xml.attrib: if "package" in xml.attrib:
package = xml.attrib["package"] package = xml.attrib["package"].encode('utf-8')
if "{http://schemas.android.com/apk/res/android}versionName" in xml.attrib: if "{http://schemas.android.com/apk/res/android}versionName" in xml.attrib:
version = xml.attrib["{http://schemas.android.com/apk/res/android}versionName"] version = xml.attrib["{http://schemas.android.com/apk/res/android}versionName"].encode('utf-8')
if "{http://schemas.android.com/apk/res/android}versionCode" in xml.attrib: if "{http://schemas.android.com/apk/res/android}versionCode" in xml.attrib:
vercode = xml.attrib["{http://schemas.android.com/apk/res/android}versionCode"] vercode = xml.attrib["{http://schemas.android.com/apk/res/android}versionCode"].encode('utf-8')
logging.debug("..got package={0}, version={1}, vercode={2}" logging.debug("..got package={0}, version={1}, vercode={2}"
.format(package, version, vercode)) .format(package, version, vercode))