Merge branch 'master' of github.com:Kozea/pygal

Conflicts: pygal/style.py
jonathaneunice · Jun 24, 2013 · 31367df · 31367df
2 parents 4427daf + 0d0e55c
commit 31367df
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pygal/style.py b/pygal/style.py
@@ -246,9 +246,10 @@ def to_dict(self):
     opacity='.5',
     opacity_hover='.9',
     transition='250ms ease-in',
-    colors=('#00b2f0', '#43d9be', '#0662ab', '#ffd541', lighten('#43d9be', 20),
-            lighten('#7dcf30', 10), darken('#0662ab', 15),
-            '#7dcf30', darken('#ffd541', 20)))
+    colors=(
+        '#00b2f0', '#43d9be', '#0662ab', darken('#00b2f0', 20),
+        lighten('#43d9be', 20), lighten('#7dcf30', 10), darken('#0662ab', 15),
+        '#ffd541', '#7dcf30', lighten('#00b2f0', 15), darken('#ffd541', 20)))
 
 
 styles = {'default': DefaultStyle,
@@ -274,8 +275,7 @@ def to_dict(self):
     def get_style_for(op_name):
         operation = getattr(colors, op_name)
 
-        def parametric_style(color, step=10, max_=None,
-                             base_style=None, **kwargs):
+        def parametric_style(color, step=10, max_=None, **kwargs):
             if max_ is None:
                 violency = {
                     'darken': 50,
@@ -293,6 +293,7 @@ def modifier(index):
                 return operation(color, percent)
 
             colors = list(map(modifier, range(0, max(2, step))))
+
             if base_style is None:
                 return Style(colors=colors, **kwargs)