From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Wed, 29 Oct 2014 10:13:34 +0000 (+0100)
Subject: [test_utils] Fix compat_getenv and compat_expanduser tests on python 3.x
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=8abec2c8bb2ff1051af63420711706497faf6de4;p=youtube-dl

[test_utils] Fix compat_getenv and compat_expanduser tests on python 3.x
---

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__':