Merge branch 'master' of github.com:rg3/youtube-dl

diff --combined test/test_utils.py
index 1c2b57609b9ec180940992d9687177cccd62ea87,febba411e45cad47a044edb5bff091f43396e71f..0b31d1a3990a1dbecb54905c49babe6e7627a547
--- 1/test/test_utils.py
--- 2/test/test_utils.py
+++ b/test/test_utils.py
@@@ -289,7 -289,6 +289,7 @@@ class TestUtil(unittest.TestCase)
          self.assertEqual(parse_iso8601('2014-03-23T23:04:26+0100'), 1395612266)
          self.assertEqual(parse_iso8601('2014-03-23T22:04:26+0000'), 1395612266)
          self.assertEqual(parse_iso8601('2014-03-23T22:04:26Z'), 1395612266)
 +        self.assertEqual(parse_iso8601('2014-03-23T22:04:26.1234Z'), 1395612266)
  
      def test_strip_jsonp(self):
          stripped = strip_jsonp('cb ([ {"id":"532cb",\n\n\n"x":\n3}\n]\n);')
@@@ -361,12 -360,14 +361,14 @@@
  
      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__':