summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/YoutubeCom.py
diff options
context:
space:
mode:
authorGravatar AndroKev <neureither.kevin@gmail.com> 2013-11-02 20:05:52 +0100
committerGravatar AndroKev <neureither.kevin@gmail.com> 2013-11-02 20:05:52 +0100
commita3686cc3851b64eab7597422e66bc8e5b9d54120 (patch)
tree52595439b2a52738ab68746834e3e3cea4695531 /module/plugins/hoster/YoutubeCom.py
parentDeleted the wildcard (diff)
parentNew crypter: FreetexthostCom (diff)
downloadpyload-a3686cc3851b64eab7597422e66bc8e5b9d54120.tar.xz
Merge remote-tracking branch 'upstream/stable' into stable
test
Diffstat (limited to 'module/plugins/hoster/YoutubeCom.py')
-rw-r--r--module/plugins/hoster/YoutubeCom.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py
index 9ef49c2d6..319eb36e6 100644
--- a/module/plugins/hoster/YoutubeCom.py
+++ b/module/plugins/hoster/YoutubeCom.py
@@ -36,7 +36,7 @@ class YoutubeCom(Hoster):
__name__ = "YoutubeCom"
__type__ = "hoster"
__pattern__ = r"https?://(?:[^/]*?)youtube\.com/watch.*?[?&]v=.*"
- __version__ = "0.37"
+ __version__ = "0.38"
__config__ = [("quality", "sd;hd;fullhd;240p;360p;480p;720p;1080p;3072p", "Quality Setting", "hd"),
("fmt", "int", "FMT/ITAG Number (5-102, 0 for auto)", 0),
(".mp4", "bool", "Allow .mp4", True),
@@ -138,7 +138,7 @@ class YoutubeCom(Hoster):
name = re.search(file_name_pattern, html).group(1).replace("/", "")
# Cleaning invalid characters from the file name
- name = name.encode('latin-1', 'replace')
+ name = name.encode('ascii', 'replace')
pyfile.name = html_unescape(name)