aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-10-29 20:10:07 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-10-29 20:10:07 +0100
commit7d11297f3f91e6ddd3f0caa5ad4dca1a40d6c820 (patch)
tree794503925069a94a5af82daf3b3d9fa786e9f58a /test
parent6ad4013d40e839211e2896129eed05ccd40ee963 (diff)
parentdbd1283d31aa1df43bf9b3255dc27a1c8bfed4ca (diff)
Merge branch 'master' of github.com:rg3/youtube-dl
Diffstat (limited to 'test')
-rw-r--r--test/test_utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py
index 1c2b57609..0b31d1a39 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -361,12 +361,14 @@ class TestUtil(unittest.TestCase):
def test_compat_getenv(self):
test_str = 'тест'
- os.environ['YOUTUBE-DL-TEST'] = test_str.encode(get_filesystem_encoding())
+ os.environ['YOUTUBE-DL-TEST'] = (test_str if sys.version_info >= (3, 0)
+ else test_str.encode(get_filesystem_encoding()))
self.assertEqual(compat_getenv('YOUTUBE-DL-TEST'), test_str)
def test_compat_expanduser(self):
test_str = 'C:\Documents and Settings\тест\Application Data'
- os.environ['HOME'] = test_str.encode(get_filesystem_encoding())
+ os.environ['HOME'] = (test_str if sys.version_info >= (3, 0)
+ else test_str.encode(get_filesystem_encoding()))
self.assertEqual(compat_expanduser('~'), test_str)
if __name__ == '__main__':