From: Philipp Hagemeister Date: Sun, 5 Jan 2014 03:41:49 +0000 (+0100) Subject: [setup.py] Do not use unicode literals X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=01c62591d142ed5d027bf096da3b7f9851acd5d6;p=youtube-dl [setup.py] Do not use unicode literals See http://bugs.python.org/issue13943 for context --- diff --git a/setup.py b/setup.py index bf7e35e3e..653ca9a73 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import pkg_resources import sys diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py index 94497054a..a4ba7bad0 100644 --- a/test/test_unicode_literals.py +++ b/test/test_unicode_literals.py @@ -7,6 +7,10 @@ import unittest rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +IGNORED_FILES = [ + 'setup.py', # http://bugs.python.org/issue13943 +] + class TestUnicodeLiterals(unittest.TestCase): def test_all_files(self): @@ -17,6 +21,9 @@ class TestUnicodeLiterals(unittest.TestCase): for basename in filenames: if not basename.endswith('.py'): continue + if basename in IGNORED_FILES: + continue + fn = os.path.join(dirpath, basename) with io.open(fn, encoding='utf-8') as inf: code = inf.read()