Merge pull request #118 from asottile/3_3_3

Upstream 3.3.3

Author: dahlia

libsass

@@ -203,8 +203,8 @@ def compile_dirname(
     for dirpath, _, filenames in os.walk(search_path):
         filenames = [
             filename for filename in filenames
-            if filename.endswith(('.scss', '.sass'))
-            and not filename.startswith('_')
+            if filename.endswith(('.scss', '.sass')) and
+            not filename.startswith('_')
         ]
         for filename in filenames:
             input_filename = os.path.join(dirpath, filename)

sass.py

@@ -58,8 +58,8 @@ def normalize_path(path):
     'sources': ['test/a.scss'],
     'names': [],
     'mappings': (
-        ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;;EALD,IAAI,CAEF,CAAC,'
-        'CAAC;IACA,KAAK,EAAE,IAAK,GACb'
+        ';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;;EALD,AAEE,IAFE,'
+        'CAEF,CAAC,CAAC;IACA,KAAK,EAAE,IAAK,GACb'
     ),
 }
 
@@ -583,13 +583,13 @@ def test_normalize_manifests(self):
     def test_build_one(self):
         d = tempfile.mkdtemp()
         src_path = os.path.join(d, 'test')
-        test_source_path = lambda *path: normalize_path(
-            os.path.join(d, 'test', *path)
-        )
-        replace_source_path = lambda s, name: s.replace(
-            'SOURCE',
-            test_source_path(name)
-        )
+
+        def test_source_path(*path):
+            return normalize_path(os.path.join(d, 'test', *path))
+
+        def replace_source_path(s, name):
+            return s.replace('SOURCE', test_source_path(name))
+
         try:
             shutil.copytree('test', src_path)
             m = Manifest(sass_path='test', css_path='css')
@@ -610,7 +610,8 @@ def test_build_one(self):
                     'sources': ['../test/b.scss'],
                     'names': [],
                     'mappings': (
-                        ';AAAA,CAAC,CACC,CAAC,CAAC;EACA,SAAS,EAAE,IAAK,GACjB'
+                        ';AAAA,AACE,CADD,CACC,CAAC,CAAC;EACA,SAAS,EAAE,IAAK,'
+                        'GACjB'
                     ),
                 },
                 os.path.join(d, 'css', 'b.scss.css.map')
@@ -629,8 +630,9 @@ def test_build_one(self):
                     'sources': ['../test/d.scss'],
                     'names': [],
                     'mappings': (
-                        ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;;EALD,'
-                        'IAAI,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,0BAA2B,GAClC'
+                        ';;AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;;'
+                        'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,0BAA2B,'
+                        'GAClC'
                     ),
                 },
                 os.path.join(d, 'css', 'd.scss.css.map')
@@ -919,7 +921,10 @@ def test_error(self):
 class SassFunctionTest(unittest.TestCase):
 
     def test_from_lambda(self):
-        lambda_ = lambda abc, d: None
+        # Hack for https://gitlab.com/pycqa/flake8/issues/117
+        def noop(x):
+            return x
+        lambda_ = noop(lambda abc, d: None)
         sf = sass.SassFunction.from_lambda('func_name', lambda_)
         self.assertEqual('func_name', sf.name)
         self.assertEqual(('$abc', '$d'), sf.arguments)