summaryrefslogtreecommitdiffstats
path: root/deluge/common.py
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2017-06-29 15:28:52 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2017-06-29 15:28:52 +0100
commit51b99caf24a3c2e30ed8f0a78fbef8db46d74494 (patch)
tree9e8157f9a25d72f00fdabc0da1fd4e5877574aaf /deluge/common.py
parent850fd34522992826984d616d4353d4d79c9d130b (diff)
downloaddeluge-51b99caf24a3c2e30ed8f0a78fbef8db46d74494.tar.gz
deluge-51b99caf24a3c2e30ed8f0a78fbef8db46d74494.tar.bz2
deluge-51b99caf24a3c2e30ed8f0a78fbef8db46d74494.zip
[Common] Add decode_string (deprecated) for compatibility
Diffstat (limited to 'deluge/common.py')
-rw-r--r--deluge/common.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/deluge/common.py b/deluge/common.py
index e9afba688..64d76b685 100644
--- a/deluge/common.py
+++ b/deluge/common.py
@@ -923,8 +923,15 @@ def decode_bytes(byte_str, encoding='utf8'):
@deprecated
-def utf8_encoded(s, encoding='utf8'):
- decode_bytes(s, encoding).encode('utf8')
+def decode_string(byte_str, encoding='utf8'):
+ """Deprecated: Use decode_bytes"""
+ decode_bytes(byte_str, encoding)
+
+
+@deprecated
+def utf8_encoded(str_, encoding='utf8'):
+ """Deprecated: Use encode or decode_bytes if needed"""
+ decode_bytes(str_, encoding).encode('utf8')
def utf8_encode_structure(data):