Import sort order

.isort.cfg

@@ -1,2 +1,3 @@
 [settings]
-multi_line_output=4
+multi_line_output=5
+default_section=THIRDPARTY

Makefile

@@ -15,6 +15,9 @@ lint:
 	$(PYTEST) --flake8 -m flake8 $(PROJECT_NAME)
 	$(PYTEST) --isort -m isort $(PROJECT_NAME)
 
+fix:
+	$(VENV)/bin/yapf -p -i pygal/**/*.py
+
 check:
 	$(PYTEST) $(PROJECT_NAME) $(PYTEST_ARGS) --cov-report= --cov=pygal
 

demo/moulinrouge/tests.py

@@ -4,7 +4,6 @@ from datetime import date, datetime
 from random import choice, randint
 
 from flask import abort
-
 from pygal import (
     CHARTS_BY_NAME, XY, Bar, Box, Config, DateLine, DateTimeLine, Dot, Funnel,
     Gauge, Histogram, HorizontalBar, Line, Pie, Pyramid, Radar, SolidGauge,

docs/ext/pygal_sphinx_directives.py

@@ -20,9 +20,8 @@
 from traceback import format_exc, print_exc
 
 import docutils.core
-from docutils.parsers.rst import Directive
-
 import pygal
+from docutils.parsers.rst import Directive
 from sphinx.directives.code import CodeBlock
 
 # Patch default style

pygal/graph/graph.py

@@ -916,8 +916,7 @@ class Graph(PublicApi):
     def _compute_x_labels_major(self):
         if self.x_labels_major_every:
             self._x_labels_major = [
-                self._x_labels[i][0]
+                self._x_labels[i][0] for i in
-                for i in
                 range(0, len(self._x_labels), self.x_labels_major_every)
             ]
 
@@ -964,8 +963,7 @@ class Graph(PublicApi):
     def _compute_y_labels_major(self):
         if self.y_labels_major_every:
             self._y_labels_major = [
-                self._y_labels[i][1]
+                self._y_labels[i][1] for i in
-                for i in
                 range(0, len(self._y_labels), self.y_labels_major_every)
             ]
 
@@ -1037,8 +1035,7 @@ class Graph(PublicApi):
         """Check if there is any data"""
         return any([
             len([
-                v
+                v for a in (s[0] if is_list_like(s) else [s])
-                for a in (s[0] if is_list_like(s) else [s])
                 for v in (a if is_list_like(a) else [a]) if v is not None
             ]) for s in self.raw_series
         ])

pygal/graph/histogram.py

@@ -49,8 +49,7 @@ class Histogram(Dual, Bar):
     def xvals(self):
         """All x values"""
         return [
-            val
+            val for serie in self.all_series for dval in serie.values
-            for serie in self.all_series for dval in serie.values
             for val in dval[1:3] if val is not None
         ]
 

pygal/graph/line.py

@@ -39,8 +39,7 @@ class Line(Graph):
     def _values(self):
         """Getter for series values (flattened)"""
         return [
-            val[1]
+            val[1] for serie in self.series for val in
-            for serie in self.series for val in
             (serie.interpolated if self.interpolate else serie.points)
             if val[1] is not None and (not self.logarithmic or val[1] > 0)
         ]
@@ -49,8 +48,7 @@ class Line(Graph):
     def _secondary_values(self):
         """Getter for secondary series values (flattened)"""
         return [
-            val[1]
+            val[1] for serie in self.secondary_series for val in
-            for serie in self.secondary_series for val in
             (serie.interpolated if self.interpolate else serie.points)
             if val[1] is not None and (not self.logarithmic or val[1] > 0)
         ]

pygal/table.py

@@ -25,7 +25,6 @@ This class is used to render an html table from a chart data.
 import uuid
 
 from lxml.html import builder, tostring
-
 from pygal.util import template
 
 

pygal/test/conftest.py

@@ -20,9 +20,8 @@
 
 import sys
 
-import pytest
-
 import pygal
+import pytest
 from pygal.etree import etree
 
 from . import get_data

pygal/test/test_graph.py

@@ -23,9 +23,8 @@ import os
 import sys
 import uuid
 
-import pytest
-
 import pygal
+import pytest
 from pygal._compat import u
 from pygal.graph.map import BaseMap
 from pygal.test import make_data

pygal/test/test_line_log_none_max_solved.py

@@ -4,6 +4,7 @@
 # in the Log graph will be max or not (issue #309)
 
 from __future__ import division
+
 from pygal import Line
 
 chart = Line(title='test', logarithmic=True)

pygal/test/test_table.py

@@ -18,9 +18,8 @@
 # along with pygal. If not, see <http://www.gnu.org/licenses/>.
 """Box chart related tests"""
 
-from pyquery import PyQuery as pq
-
 from pygal import Pie
+from pyquery import PyQuery as pq
 
 
 def test_pie_table():

pygal/test/test_util.py

@@ -20,13 +20,12 @@
 
 import sys
 
-from pytest import raises
-
 from pygal._compat import _ellipsis, u
 from pygal.util import (
     _swap_curly, majorize, mergextend, minify_css, round_to_float,
     round_to_int, template, truncate
 )
+from pytest import raises
 
 
 def test_round_to_int():