diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-16 16:37:16 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-04-16 16:37:16 +0000 |
commit | b101eec5e1fa0a0d1903f5c151afc4d0850c6e7a (patch) | |
tree | b9a6b60023b853553ae095370bf251a2f1f7640e /catapult/devil/devil/android/sdk/shared_prefs.py | |
parent | c3c0a062c154059518c98495eab1005569def05b (diff) | |
parent | 4537bffda5f89155f2f27afc7c80e4c0354c1c20 (diff) | |
download | chromium-trace-b101eec5e1fa0a0d1903f5c151afc4d0850c6e7a.tar.gz |
Merge changes I195c394b,Iff693cf6
* changes:
Update catapult to latest version(ab9d330fe2)
Update scripts to specify python2
Diffstat (limited to 'catapult/devil/devil/android/sdk/shared_prefs.py')
-rw-r--r-- | catapult/devil/devil/android/sdk/shared_prefs.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/catapult/devil/devil/android/sdk/shared_prefs.py b/catapult/devil/devil/android/sdk/shared_prefs.py index 7b12bf54..32b5bc4d 100644 --- a/catapult/devil/devil/android/sdk/shared_prefs.py +++ b/catapult/devil/devil/android/sdk/shared_prefs.py @@ -11,6 +11,8 @@ import logging import posixpath from xml.etree import ElementTree +import six + from devil.android import device_errors from devil.android.sdk import version_codes @@ -43,7 +45,10 @@ class BasePref(object): def __str__(self): """Get the underlying xml element as a string.""" - return ElementTree.tostring(self._elem) + if six.PY2: + return ElementTree.tostring(self._elem) + else: + return ElementTree.tostring(self._elem, encoding="unicode") def get(self): """Get the value of this preference.""" @@ -231,7 +236,11 @@ class SharedPrefs(object): def __str__(self): """Get the underlying xml document as a string.""" - return _XML_DECLARATION + ElementTree.tostring(self.xml) + if six.PY2: + return _XML_DECLARATION + ElementTree.tostring(self.xml) + else: + return _XML_DECLARATION + \ + ElementTree.tostring(self.xml, encoding="unicode") @property def package(self): |