← Back to branch summary

~ubuntu-branches/debian/jessie/subdownloader/jessie

« back to all changes in this revision

Viewing changes to debian/patches/fix-non-ascii-download-path.patch

  • Committer: Package Import Robot
  • Author(s): Emilien Klein
  • Date: 2012-11-10 12:43:07 UTC
  • Revision ID: package-import@ubuntu.com-20121110124307-1xrq5k2udnl7m524
Tags: 2.0.14-1.1
http://bugs.debian.org/606993
https://launchpad.net/bugs/913453
https://launchpad.net/bugs/306589
* Non-maintainer upload.
* debian/patches/fix-non-ascii-download-path.patch:
  + Fix downloading subtitles in folders containing non-ASCII characters
    (Closes: #606993), (LP: #913453, #306589)
* debian/source/format:
  Update to "3.0 (quilt)" to apply the previous patch in a proper way

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-non-ascii-download-path.patch
 
1
From: Emilien Klein <emilien+debian@klein.st>
 
2
Subject: Fix downloading subtitles in folders containing non-ASCII characters
 
3
 
 
4
* gui/main.py: Remove call to .decode()
 
5
 
 
6
Origin: upstream, http://bazaar.launchpad.net/~subdownloader-developers/subdownloader/trunk/revision/552
 
7
Bug: https://bugs.launchpad.net/subdownloader/+bug/913453
 
8
Bug-Debian: http://bugs.debian.org/606993
 
9
--- a/gui/main.py
 
10
+++ b/gui/main.py
 
11
@@ -1009,7 +1009,7 @@
 
12
             folderPath = video.getFolderPath()
 
13
             dir = QDir(QString(folderPath))
 
14
             #downloadFullPath = dir.filePath(QString(subFileName)).__str__()
 
15
-            downloadFullPath = os.path.join(folderPath, subFileName).decode('utf8')
 
16
+            downloadFullPath = os.path.join(folderPath, subFileName)
 
17
             log.debug("Downloading to: %r"% downloadFullPath)
 
18
         elif optionWhereToDownload == QVariant("PREDEFINED_FOLDER"):
 
19
             folderPath = settings.value("options/whereToDownloadFolder", QVariant("")).toString()