colormap returns only module types which make sense for a given (Micr…

…o) QR Code version. Closes #62.

segno/writers.py

@@ -524,7 +524,7 @@ def scanline(row, filter_type=b'\0'):
     transparent = (-1, -1, -1, -1)  # Invalid placeholder for transparent color
     dark_idx = consts.TYPE_FINDER_PATTERN_DARK
     qz_idx = consts.TYPE_QUIET_ZONE
-    color_mapping = _make_colormap(dark=dark, light=light, finder_dark=finder_dark,
+    color_mapping = _make_colormap(version, dark=dark, light=light, finder_dark=finder_dark,
                               finder_light=finder_light, data_dark=data_dark,
                               data_light=data_light, version_dark=version_dark,
                               version_light=version_light, format_dark=format_dark,
@@ -1063,15 +1063,15 @@ def _pack_bits_into_byte(iterable):
             for e in zip_longest(*[iter(iterable)] * 8, fillvalue=0x0))
 
 
-def _make_colormap(dark, light,
-             finder_dark=False, finder_light=False,
-             data_dark=False, data_light=False,
-             version_dark=False, version_light=False,
-             format_dark=False, format_light=False,
-             alignment_dark=False, alignment_light=False,
-             timing_dark=False, timing_light=False,
-             separator=False, dark_module=False,
-             quiet_zone=False):
+def _make_colormap(version, dark, light,
+                   finder_dark=False, finder_light=False,
+                   data_dark=False, data_light=False,
+                   version_dark=False, version_light=False,
+                   format_dark=False, format_light=False,
+                   alignment_dark=False, alignment_light=False,
+                   timing_dark=False, timing_light=False,
+                   separator=False, dark_module=False,
+                   quiet_zone=False):
     """\
     Creates and returns a module type -> color map.
 
@@ -1092,6 +1092,7 @@ def _make_colormap(dark, light,
         # will be brown
         cm = colormap(timing_dark=(165, 42, 42))
 
+    :param version: QR Code version (int constant)
     :param dark: Default color of dark modules
     :param light: Default color of light modules
     :param finder_dark: Color of the dark modules of the finder patterns.
@@ -1111,6 +1112,13 @@ def _make_colormap(dark, light,
     :param quiet_zone: Color of the quiet zone / border.
     :rtype: dict
     """
+    unsupported = []
+    if version < 7:
+        unsupported = [consts.TYPE_VERSION_DARK, consts.TYPE_VERSION_LIGHT]
+    if version < 1:  # Micro QR Code
+        unsupported.extend([consts.TYPE_DARKMODULE,
+                            consts.TYPE_ALIGNMENT_PATTERN_DARK,
+                            consts.TYPE_ALIGNMENT_PATTERN_LIGHT])
     mt2color = {
         consts.TYPE_FINDER_PATTERN_DARK: finder_dark if finder_dark else dark,
         consts.TYPE_FINDER_PATTERN_LIGHT: finder_light if finder_light else light,
@@ -1128,7 +1136,7 @@ def _make_colormap(dark, light,
         consts.TYPE_DARKMODULE: dark_module if dark_module is not False else dark,
         consts.TYPE_QUIET_ZONE: quiet_zone if quiet_zone is not False else light,
     }
-    return dict([(clr, val) for clr, val in mt2color.items() if val or val is None])
+    return dict([(mt, val) for mt, val in mt2color.items() if (val or val is None) and mt not in unsupported])
 
 
 _VALID_SERIALIZERS = {