Replaces 'compress_blocks' with 'combine_blocks', which is more fitting

compress.py

@@ -1,4 +1,4 @@
-def compress_blocks(blocks):
+def combine_blocks(blocks):
     # Map of property stringification to list of containing blocks
     #property_locations = {}
 

csscom.py

@@ -5,11 +5,11 @@ from parse import parse_groups
 from generate import generate_group
 
 
-def compress_css(css, compress_blocks=True, compress_whitespace=True,
+def compress_css(css, combine_blocks=True, compress_whitespace=True,
                  compress_color=True, compress_font=True,
                  compress_dimension=True, sort_properties=True):
     groups = parse_groups(css)
-    options = dict(compress_blocks=compress_blocks,
+    options = dict(combine_blocks=combine_blocks,
                    compress_whitespace=compress_whitespace,
                    compress_color=compress_color,
                    compress_font=compress_font,
@@ -35,7 +35,7 @@ def parse_options():
     parser.add_argument('-cd', '--compress-dimension', action='store_true',
                         help='replace separate margin/padding statements with '
                              'shortcut statements where possible')
-    parser.add_argument('-cb', '--compress-blocks', action='store_true',
+    parser.add_argument('-cb', '--combine-blocks', action='store_true',
                         help='combine or split blocks into blocks with '
                              'comma-separated selectors if it results in less '
                              'css code')
@@ -50,9 +50,9 @@ def parse_options():
     # Enable all compression options if none are explicitely enabled
     if not any([args.compress_whitespace, args.compress_color,
                 args.compress_font, args.compress_dimension,
-                args.compress_blocks]) and not args.no_compression:
+                args.combine_blocks]) and not args.no_compression:
         args.compress_whitespace = args.compress_color = args.compress_font = \
-                args.compress_dimension = args.compress_blocks = True
+                args.compress_dimension = args.combine_blocks = True
 
     return args
 

generate.py

@@ -59,14 +59,14 @@ def generate_block(selectors, properties, compress_whitespace=False,
                            compress_whitespace=compress_whitespace, tab=tab)
 
 
-def generate_group(selectors, blocks, compress_blocks=True,
+def generate_group(selectors, blocks, combine_blocks=True,
                    compress_whitespace=True, compress_color=True,
                    compress_font=True, compress_dimension=True,
                    sort_properties=True, tab='\t'):
     compressed_blocks = []
 
-    if compress_blocks:
-        blocks = compress.compress_blocks(blocks)
+    if combine_blocks:
+        blocks = compress.combine_blocks(blocks)
 
     for block_selectors, properties in blocks:
         if compress_color:

tests/test_compress.py

@@ -1,11 +1,11 @@
 from unittest import TestCase
 
-from compress import compress_blocks, compress_color, compress_font, \
+from compress import combine_blocks, compress_color, compress_font, \
         compress_dimension
 
 
 class TestProperties(TestCase):
-    def test_compress_blocks(self):
+    def test_combine_blocks(self):
         pass
 
     def test_compress_color(self):