summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-10-29 11:13:34 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2014-10-29 11:13:34 +0100
commit8abec2c8bb2ff1051af63420711706497faf6de4 (patch)
tree5b31f44fca71c7bf5cbdb6a5fa926eff10ccfc60
parenta9bad429b309e614b4b8905c085ef425350ceeb2 (diff)
downloadyoutube-dl-8abec2c8bb2ff1051af63420711706497faf6de4.tar.gz
youtube-dl-8abec2c8bb2ff1051af63420711706497faf6de4.tar.xz
youtube-dl-8abec2c8bb2ff1051af63420711706497faf6de4.zip
[test_utils] Fix compat_getenv and compat_expanduser tests on python 3.x
-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 19f9fce20..febba411e 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -360,12 +360,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__':