Stop forcing debugging comments when creating sourcemap

Author: tisdall

pysass.cpp

@@ -575,7 +575,7 @@ PySass_compile_filename(PyObject *self, PyObject *args) {
     context = sass_make_file_context(filename);
     options = sass_file_context_get_options(context);
 
-    if (source_comments && PySass_Bytes_Check(source_map_filename)) {
+    if (PySass_Bytes_Check(source_map_filename)) {
         size_t source_map_file_len = PySass_Bytes_GET_SIZE(source_map_filename);
         if (source_map_file_len) {
             char *source_map_file = (char *) malloc(source_map_file_len + 1);

sass.py

@@ -537,8 +537,6 @@ def my_importer(path):
         raise CompileError('source_map_filename is only available with '
                            'filename= keyword argument since it has to be '
                            'aware of it')
-    if source_map_filename is not None:
-        source_comments = True
     try:
         include_paths = kwargs.pop('include_paths') or b''
     except KeyError:

sasstests.py

@@ -45,10 +45,8 @@ def normalize_path(path):
 '''
 
 A_EXPECTED_CSS_WITH_MAP = '''\
-/* line 6, SOURCE */
 body {
   background-color: green; }
-  /* line 8, SOURCE */
   body a {
     color: blue; }
 
@@ -60,8 +58,8 @@ def normalize_path(path):
     'sources': ['test/a.scss'],
     'names': [],
     'mappings': (
-        ';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;;EALD,AAEE,IAFE,'
-        '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'
     ),
 }
 
@@ -71,7 +69,6 @@ def normalize_path(path):
 '''
 
 B_EXPECTED_CSS_WITH_MAP = '''\
-/* line 2, SOURCE */
 b i {
   font-size: 20px; }
 
@@ -97,10 +94,8 @@ def normalize_path(path):
 
 D_EXPECTED_CSS_WITH_MAP = '''\
 @charset "UTF-8";
-/* line 6, SOURCE */
 body {
   background-color: green; }
-  /* line 8, SOURCE */
   body a {
     font: '나눔고딕', sans-serif; }
 
@@ -446,10 +441,7 @@ def test_compile_source_map(self):
             source_map_filename='a.scss.css.map'
         )
         self.assertEqual(
-            A_EXPECTED_CSS_WITH_MAP.replace(
-                'SOURCE',
-                normalize_path(os.path.abspath(filename))
-            ),
+            A_EXPECTED_CSS_WITH_MAP,
             actual
         )
         self.assert_source_map_equal(A_EXPECTED_MAP, source_map)
@@ -612,7 +604,7 @@ def replace_source_path(s, name):
                     'sources': ['../test/b.scss'],
                     'names': [],
                     'mappings': (
-                        ';AAAA,AACE,CADD,CACC,CAAC,CAAC;EACA,SAAS,EAAE,IAAK,'
+                        'AAAA,AACE,CADD,CACC,CAAC,CAAC;EACA,SAAS,EAAE,IAAK,'
                         'GACjB'
                     ),
                 },
@@ -632,7 +624,7 @@ def replace_source_path(s, name):
                     'sources': ['../test/d.scss'],
                     'names': [],
                     'mappings': (
-                        ';;AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;;'
+                        ';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;'
                         'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,0BAA2B,'
                         'GAClC'
                     ),
@@ -667,7 +659,7 @@ def test_wsgi_sass_middleware(self):
             self.assertEqual(200, r.status_code)
             src_path = normalize_path(os.path.join(src_dir, 'a.scss'))
             self.assert_bytes_equal(
-                b(A_EXPECTED_CSS_WITH_MAP.replace('SOURCE', src_path)),
+                b(A_EXPECTED_CSS_WITH_MAP),
                 r.data
             )
             self.assertEqual('text/css', r.mimetype)
@@ -818,9 +810,7 @@ def test_sassc_sourcemap(self):
             self.assertEqual('', self.out.getvalue())
             with open(out_filename) as f:
                 self.assertEqual(
-                    A_EXPECTED_CSS_WITH_MAP.replace(
-                        'SOURCE', normalize_path(src_filename)
-                    ),
+                    A_EXPECTED_CSS_WITH_MAP,
                     f.read().strip()
                 )
             with open(out_filename + '.map') as f: