Tidy the changelog.

[youtubedl] / test / test_unicode_literals.py

diff --git a/test/test_unicode_literals.py b/test/test_unicode_literals.py
index 2cc431b0be5c58db1aaf9ac2de8e495090089f65..7f816698e7b2e20bc982b0eeb9638885edf19b48 100644 (file)
--- a/test/test_unicode_literals.py
+++ b/test/test_unicode_literals.py
@@ -1,9 +1,13 @@
 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__)))
 
 
 rootDir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 


@@ -14,6 +18,9 @@ IGNORED_FILES = [
 ]
 
 
 ]
 
 

+from test.helper import assertRegexpMatches
+
+

 class TestUnicodeLiterals(unittest.TestCase):
     def test_all_files(self):
         for dirpath, _, filenames in os.walk(rootDir):
 class TestUnicodeLiterals(unittest.TestCase):
     def test_all_files(self):
         for dirpath, _, filenames in os.walk(rootDir):


@@ -29,9 +36,10 @@ class TestUnicodeLiterals(unittest.TestCase):
 
                 if "'" not in code and '"' not in code:
                     continue
 
                 if "'" not in code and '"' not in code:
                     continue

-                self.assertRegexpMatches(
+                assertRegexpMatches(
+                    self,

                     code,
                     code,

-                    r'(?:#.*\n*)?from __future__ import (?:[a-z_]+,\s*)*unicode_literals',
+                    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)
                     'unicode_literals import  missing in %s' % fn)
 
                 m = re.search(r'(?<=\s)u[\'"](?!\)|,|$)', code)