Skip to content

Commit d8b0472

Browse files
committed
Sort python imports
1 parent fcc6d5d commit d8b0472

29 files changed

+65
-35
lines changed

build_link_map.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
# filename -> title mapping to a xml file.
2222

2323
import fnmatch
24-
import re
2524
import os
25+
import re
26+
2627
from link_map import LinkMap
2728

2829

commands/preprocess.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919

2020
import fnmatch
2121
import io
22-
import re
2322
import os
23+
import re
2424
import shutil
2525
import urllib.parse
26+
2627
from lxml import etree
2728

2829

commands/preprocess_cssless.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
import logging
2222
import os
2323
import warnings
24-
from premailer import Premailer
24+
2525
import cssutils
2626
from lxml import etree
2727
from lxml.etree import strip_elements
28+
from premailer import Premailer
2829

2930

3031
def preprocess_html_merge_cssless(src_path, dst_path):

ddg_parse_html.py

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import re
2222
from copy import deepcopy
23+
2324
import lxml.etree as e
2425

2526

devhelp2qch.py

+2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020

2121
import argparse
22+
2223
from lxml import etree
24+
2325
from index_transform.devhelp_qch import convert_devhelp_to_qch
2426

2527

export.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
'''
2020

2121
import argparse
22+
import json
2223
import urllib.parse
2324
import urllib.request
24-
import json
2525

2626

2727
def retrieve_page_names(root, ns_index):

fix_devhelp-links.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
'''
2020

2121
import sys
22+
2223
import lxml.etree as e
23-
from link_map import LinkMap
2424

25+
from link_map import LinkMap
2526

2627
if len(sys.argv) != 3:
2728
print('''Please provide the following 2 argument:

gadgets/replace_tests_base.py

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import re
2525
import sys
2626

27+
2728
def get_html_files(root):
2829
files = []
2930
for dir, dirnames, filenames in os.walk(root):

gadgets/standard_revisions_tests/base.py

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'''
1919

2020
import unittest
21+
2122
from selenium import webdriver
2223
from selenium.webdriver.support.ui import Select
2324

gadgets/sync_tests_mwiki.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
# command line.
3030
os.environ['PYWIKIBOT2_NO_USER_CONFIG']='1'
3131

32-
import pywikibot
33-
import pywikibot.config2
34-
import pywikibot.pagegenerators
35-
import pywikibot.data.api
36-
3732
import argparse
3833
import itertools
3934
import shutil
4035
import sys
4136
import urllib
4237

38+
import pywikibot
39+
import pywikibot.config2
40+
import pywikibot.data.api
41+
import pywikibot.pagegenerators
42+
4343
SYNC_DIRECTION_UPLOAD = 1
4444
SYNC_DIRECTION_DOWNLOAD = 2
4545

images/math-atan2.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
# You should have received a copy of the GNU General Public License
1818
# along with this program. If not, see http://www.gnu.org/licenses/.
1919

20+
import math
21+
import os
22+
import pprint
23+
2024
import matplotlib.cm as cm
2125
import matplotlib.colors as colors
2226
import matplotlib.pyplot as plt
23-
24-
import os
2527
import numpy as np
26-
import math
27-
import pprint
2828

2929
font = {'family' : 'DejaVu Sans',
3030
'weight' : 'normal',

images/math.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
# You should have received a copy of the GNU General Public License
1717
# along with this program. If not, see http://www.gnu.org/licenses/.
1818

19-
import matplotlib.pyplot as plt
2019
import os
21-
from numpy import *
2220
from bisect import *
2321

22+
import matplotlib.pyplot as plt
23+
from numpy import *
24+
2425
#
2526
# DATA - array of items describing data to plot
2627
# Each item consists of the following parts

index2autolinker.py

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import argparse
2222
import json
23+
2324
from index_transform.autolinker import Index2AutolinkerGroups
2425
from index_transform.autolinker import Index2AutolinkerLinks
2526

index2browser.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'''
2020

2121
import argparse
22+
2223
from index_transform.browser import Index2Browser
2324

2425

index2ddg.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,17 @@
2121
import argparse
2222
import fnmatch
2323
import os
24-
import sys
2524
import re
25+
import sys
2626

2727
import lxml.etree as e
2828
from lxml import html
2929

30-
from index_transform.common import IndexTransform
3130
from build_link_map import build_link_map
32-
from ddg_parse_html import get_declarations, get_short_description, DdgException
31+
from ddg_parse_html import DdgException
32+
from ddg_parse_html import get_declarations
33+
from ddg_parse_html import get_short_description
34+
from index_transform.common import IndexTransform
3335

3436
# Entry types
3537
# a class or struct

index2devhelp.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'''
2020

2121
import argparse
22+
2223
from index_transform.devhelp import transform_devhelp
2324

2425

index2doxygen-tag.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@
1919
'''
2020

2121
import argparse
22+
2223
from lxml import etree
23-
from link_map import LinkMap
24+
2425
from index_transform.doxygen_tag import Index2DoxygenTag
2526
from index_transform.doxygen_tag import Item
2627
from index_transform.doxygen_tag import print_map
28+
from link_map import LinkMap
2729

2830

2931
def main():

index2highlight.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'''
2020

2121
import argparse
22+
2223
from index_transform.highlight import Index2Highlight
2324

2425

index2search.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'''
2020

2121
import argparse
22+
2223
from index_transform.search import Index2Search
2324

2425

index_transform/common.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import lxml.etree as e
2222

23-
2423
'''
2524
This is a python script for various transformations of the index.
2625

index_transform/devhelp.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'''
2020

2121
from lxml import etree
22+
2223
from index_transform.common import IndexTransform
2324

2425

index_transform/doxygen_tag.py

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
'''
2020

2121
from functools import total_ordering
22+
2223
from index_transform.common import IndexTransform
2324
from xml_utils import xml_escape
2425

misc/fontforge-gen.python

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
# along with this program. If not, see http://www.gnu.org/licenses/.
1919

2020

21-
import fontforge
2221
import os
23-
import psMat
2422
import sys
2523

24+
import fontforge
25+
import psMat
26+
2627
inputFont = sys.argv[1]
2728
outputFont = os.path.splitext(inputFont)[0] + "Condensed80.otf"
2829

preprocess.py

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import concurrent.futures
2222
import os
2323
import shutil
24+
2425
from commands import preprocess
2526

2627

preprocess_qch.py

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import concurrent.futures
2222
import os
2323
import shutil
24+
2425
from commands import preprocess_cssless
2526

2627

tests/test_devhelp.py

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import os
1919
import unittest
20+
2021
from index_transform.devhelp import transform_devhelp
2122

2223

tests/test_devhelp_qch.py

+2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
import os
1919
import unittest
20+
2021
from lxml import etree
22+
2123
from index_transform.devhelp_qch import convert_devhelp_to_qch
2224

2325

tests/test_preprocess.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,29 @@
1818
# You should have received a copy of the GNU General Public License
1919
# along with this program. If not, see http://www.gnu.org/licenses/.
2020

21+
import contextlib
2122
import io
2223
import os
2324
import sys
24-
import contextlib
2525
import unittest
2626
import unittest.mock
27+
2728
from lxml import etree
29+
2830
from commands.preprocess import build_rename_map
2931
from commands.preprocess import convert_loader_name
3032
from commands.preprocess import has_class
3133
from commands.preprocess import is_external_link
3234
from commands.preprocess import is_ranges_placeholder
33-
from commands.preprocess import remove_noprint
34-
from commands.preprocess import remove_see_also
35-
from commands.preprocess import remove_google_analytics
3635
from commands.preprocess import remove_ads
3736
from commands.preprocess import remove_fileinfo
37+
from commands.preprocess import remove_google_analytics
38+
from commands.preprocess import remove_noprint
39+
from commands.preprocess import remove_see_also
3840
from commands.preprocess import remove_unused_external
41+
from commands.preprocess import rename_files
3942
from commands.preprocess import transform_ranges_placeholder
4043
from commands.preprocess import trasform_relative_link
41-
from commands.preprocess import rename_files
4244

4345

4446
class DummyFile(object):

tests/test_preprocess_cssless.py

+9-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@
1717

1818
import os
1919
import unittest
20+
2021
from lxml import etree
21-
from commands.preprocess_cssless import preprocess_html_merge_cssless
22-
from commands.preprocess_cssless import silence_cssutils_warnings
23-
from commands.preprocess_cssless import convert_span_tables_to_tr_td
24-
from commands.preprocess_cssless import convert_inline_block_elements_to_table
25-
from commands.preprocess_cssless import convert_zero_td_width_to_nonzero
22+
2623
from commands.preprocess_cssless import apply_font_size
2724
from commands.preprocess_cssless import convert_font_size_property_to_pt
28-
from commands.preprocess_cssless \
29-
import convert_table_border_top_to_tr_background
25+
from commands.preprocess_cssless import convert_inline_block_elements_to_table
26+
from commands.preprocess_cssless import convert_span_tables_to_tr_td
27+
from commands.preprocess_cssless import \
28+
convert_table_border_top_to_tr_background
29+
from commands.preprocess_cssless import convert_zero_td_width_to_nonzero
30+
from commands.preprocess_cssless import preprocess_html_merge_cssless
31+
from commands.preprocess_cssless import silence_cssutils_warnings
3032

3133

3234
class TestPreprocessHtmlMergeCss(unittest.TestCase):

0 commit comments

Comments
 (0)