From 2d6298c301327b257efceb3b0401cb48d9fd8ffe Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Mon, 14 Dec 2015 17:43:54 +0100 Subject: [PATCH] [pylint] Correct import order --- patacrep/content/__init__.py | 3 ++- patacrep/content/song.py | 3 ++- patacrep/songbook/__main__.py | 2 +- patacrep/songs/chordpro/__init__.py | 5 +++-- patacrep/songs/chordpro/syntax.py | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/patacrep/content/__init__.py b/patacrep/content/__init__.py index db7d0514..a0c84361 100755 --- a/patacrep/content/__init__.py +++ b/patacrep/content/__init__.py @@ -66,12 +66,13 @@ More documentation in the docstring of Content. """ import glob -import jinja2 import logging import os import re import sys +import jinja2 + from patacrep import files from patacrep.errors import SongbookError diff --git a/patacrep/content/song.py b/patacrep/content/song.py index c7925354..ad193c02 100755 --- a/patacrep/content/song.py +++ b/patacrep/content/song.py @@ -1,11 +1,12 @@ """Plugin to include songs to the songbook.""" import glob -import jinja2 import logging import os import textwrap +import jinja2 + from patacrep.content import process_content, ContentError, Content from patacrep import files, errors diff --git a/patacrep/songbook/__main__.py b/patacrep/songbook/__main__.py index b972b04c..b62dcf73 100644 --- a/patacrep/songbook/__main__.py +++ b/patacrep/songbook/__main__.py @@ -1,12 +1,12 @@ """Command line tool to compile songbooks using the songbook library.""" import argparse -import yaml import locale import logging import os.path import textwrap import sys +import yaml from patacrep.build import SongbookBuilder, DEFAULT_STEPS from patacrep.utils import yesno diff --git a/patacrep/songs/chordpro/__init__.py b/patacrep/songs/chordpro/__init__.py index 5777b170..a01c31f4 100644 --- a/patacrep/songs/chordpro/__init__.py +++ b/patacrep/songs/chordpro/__init__.py @@ -1,11 +1,12 @@ """Chordpro parser""" -from jinja2 import Environment, FileSystemLoader, contextfunction, ChoiceLoader -import jinja2 import logging import operator import os +from jinja2 import Environment, FileSystemLoader, contextfunction, ChoiceLoader +import jinja2 + from patacrep import encoding, files, pkg_datapath from patacrep.songs import Song from patacrep.songs.chordpro.syntax import parse_song diff --git a/patacrep/songs/chordpro/syntax.py b/patacrep/songs/chordpro/syntax.py index 999d31a5..66b9b571 100644 --- a/patacrep/songs/chordpro/syntax.py +++ b/patacrep/songs/chordpro/syntax.py @@ -1,9 +1,10 @@ """ChordPro parser""" import logging -import ply.yacc as yacc import re +import ply.yacc as yacc + from patacrep.songs.syntax import Parser from patacrep.songs.chordpro import ast from patacrep.songs.chordpro.lexer import tokens, ChordProLexer