Update upstream source from tag 'upstream/2020.06.16.1'

[youtubedl] / test / test_unicode_literals.py

diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py
index a4ba7bad03b85f7c7e69ded7b435898c7b17e11e..6c1b7ec915c60321e62c7c44728f5486921e772f 100644 (file)
--- a/test/test_unicode_literals.py
+++ b/test/test_unicode_literals.py
@@ -1,23 +1,38 @@
 from __future__ import unicode_literals
 
 from __future__ import unicode_literals
 

-import io
+# Allow direct execution

 import os
 import os

-import re
+import sys

 import unittest
 import unittest

+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+import io
+import re

 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 IGNORED_FILES = [
     'setup.py',  # http://bugs.python.org/issue13943
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 IGNORED_FILES = [
     'setup.py',  # http://bugs.python.org/issue13943

+    'conf.py',
+    'buildserver.py',

 ]
 
 ]
 

+IGNORED_DIRS = [
+    '.git',
+    '.tox',
+]
+
+from test.helper import assertRegexpMatches
+

 
 class TestUnicodeLiterals(unittest.TestCase):
     def test_all_files(self):
 
 class TestUnicodeLiterals(unittest.TestCase):
     def test_all_files(self):

-        print('Skipping this test (not yet fully implemented)')
-        return
-
-        for dirpath, _, filenames in os.walk(rootDir):
+        for dirpath, dirnames, filenames in os.walk(rootDir):
+            for ignore_dir in IGNORED_DIRS:
+                if ignore_dir in dirnames:
+                    # If we remove the directory from dirnames os.walk won't
+                    # recurse into it
+                    dirnames.remove(ignore_dir)

             for basename in filenames:
                 if not basename.endswith('.py'):
                     continue
             for basename in filenames:
                 if not basename.endswith('.py'):
                     continue


@@ -30,10 +45,11 @@ class TestUnicodeLiterals(unittest.TestCase):
 
                 if "'" not in code and '"' not in code:
                     continue
 
                 if "'" not in code and '"' not in code:
                     continue

-                imps = 'from __future__ import unicode_literals'
-                self.assertTrue(
-                    imps in code,
-                    ' %s  missing in %s' % (imps, fn))
+                assertRegexpMatches(
+                    self,
+                    code,
+                    r'(?:(?:#.*?|\s*)\n)*from __future__ import (?:[a-z_]+,\s*)*unicode_literals',
+                    'unicode_literals import  missing in %s' % fn)

 
                 m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)
                 if m is not None:
 
                 m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)
                 if m is not None: