From 124636cb856f2f5045826c569f768bf86e1703a9 Mon Sep 17 00:00:00 2001 From: Adam Waldenberg Date: Wed, 21 Oct 2015 05:26:20 +0200 Subject: [PATCH] Restructured imports slightly. --- gitinspector/blame.py | 10 ++-------- gitinspector/changes.py | 6 +----- gitinspector/clone.py | 1 - gitinspector/config.py | 8 +------- gitinspector/format.py | 7 +------ gitinspector/gitinspector.py | 17 ++--------------- gitinspector/help.py | 2 -- gitinspector/localization.py | 2 -- gitinspector/metrics.py | 6 +----- gitinspector/output/blameoutput.py | 7 +------ gitinspector/output/changesoutput.py | 7 +------ gitinspector/output/extensionsoutput.py | 6 +----- gitinspector/output/filteringoutput.py | 3 +-- gitinspector/output/metricsoutput.py | 1 - gitinspector/output/responsibilitiesoutput.py | 9 +-------- gitinspector/output/timelineoutput.py | 7 +------ gitinspector/responsibilities.py | 4 +--- gitinspector/version.py | 2 -- 18 files changed, 15 insertions(+), 90 deletions(-) diff --git a/gitinspector/blame.py b/gitinspector/blame.py index a0c1212..4fe31aa 100644 --- a/gitinspector/blame.py +++ b/gitinspector/blame.py @@ -25,15 +25,9 @@ import re import subprocess import sys import threading - -from .changes import FileDiff -from . import comment -from . import filtering -from . import format -from . import interval from .localization import N_ -from . import terminal - +from .changes import FileDiff +from . import comment, filtering, format, interval, terminal NUM_THREADS = multiprocessing.cpu_count() diff --git a/gitinspector/changes.py b/gitinspector/changes.py index 7d28155..6fbd5c8 100644 --- a/gitinspector/changes.py +++ b/gitinspector/changes.py @@ -23,11 +23,7 @@ import multiprocessing import os import subprocess import threading - -from . import extensions -from . import filtering -from . import interval - +from . import extensions, filtering, interval CHANGES_PER_THREAD = 200 NUM_THREADS = multiprocessing.cpu_count() diff --git a/gitinspector/clone.py b/gitinspector/clone.py index 596841e..667f498 100644 --- a/gitinspector/clone.py +++ b/gitinspector/clone.py @@ -18,7 +18,6 @@ # along with gitinspector. If not, see . from __future__ import unicode_literals - import shutil import subprocess import sys diff --git a/gitinspector/config.py b/gitinspector/config.py index 911bb87..94cda63 100644 --- a/gitinspector/config.py +++ b/gitinspector/config.py @@ -18,15 +18,9 @@ # along with gitinspector. If not, see . from __future__ import unicode_literals - import os import subprocess - -from . import extensions -from . import filtering -from . import format -from . import interval -from . import optval +from . import extensions, filtering, format, interval, optval def __read_git_config__(repo, variable): previous_directory = os.getcwd() diff --git a/gitinspector/format.py b/gitinspector/format.py index 04968a2..0674202 100644 --- a/gitinspector/format.py +++ b/gitinspector/format.py @@ -24,12 +24,7 @@ import os import textwrap import time import zipfile - -from . import basedir -from . import localization -from . import terminal -from . import version - +from . import basedir, localization, terminal, version __available_formats__ = ["html", "htmlembedded", "text", "xml"] diff --git a/gitinspector/gitinspector.py b/gitinspector/gitinspector.py index aa5c7ce..7b2c474 100755 --- a/gitinspector/gitinspector.py +++ b/gitinspector/gitinspector.py @@ -19,25 +19,12 @@ from __future__ import print_function from __future__ import unicode_literals - import atexit import getopt import os import sys - -from . import basedir -from . import changes -from . import clone -from . import config -from . import extensions -from . import filtering -from . import format -from . import help -from . import interval -from . import localization -from . import optval -from . import terminal -from . import version +from . import (basedir, changes, clone, config, extensions, filtering, format, help, interval, + localization, optval, terminal, version) from .output import outputable from .output.blameoutput import BlameOutput from .output.changesoutput import ChangesOutput diff --git a/gitinspector/help.py b/gitinspector/help.py index 2b211f6..fe439d8 100644 --- a/gitinspector/help.py +++ b/gitinspector/help.py @@ -19,9 +19,7 @@ from __future__ import print_function from __future__ import unicode_literals - import sys - from .extensions import DEFAULT_EXTENSIONS from .format import __available_formats__ diff --git a/gitinspector/localization.py b/gitinspector/localization.py index 4e74f14..ceac0a7 100644 --- a/gitinspector/localization.py +++ b/gitinspector/localization.py @@ -19,14 +19,12 @@ from __future__ import print_function from __future__ import unicode_literals - import gettext import locale import os import re import sys import time - from . import basedir __enabled__ = False diff --git a/gitinspector/metrics.py b/gitinspector/metrics.py index 915b249..8a35084 100644 --- a/gitinspector/metrics.py +++ b/gitinspector/metrics.py @@ -18,14 +18,10 @@ # along with gitinspector. If not, see . from __future__ import unicode_literals - import re import subprocess - from .changes import FileDiff -from . import comment -from . import filtering -from . import interval +from . import comment, filtering, interval __metric_eloc__ = {"java": 500, "c": 500, "cpp": 500, "cs": 500, "h": 300, "hpp": 300, "php": 500, "py": 500, "glsl": 1000, "rb": 500, "js": 500, "sql": 1000, "xml": 1000} diff --git a/gitinspector/output/blameoutput.py b/gitinspector/output/blameoutput.py index 7056beb..17a8b96 100644 --- a/gitinspector/output/blameoutput.py +++ b/gitinspector/output/blameoutput.py @@ -19,16 +19,11 @@ from __future__ import print_function from __future__ import unicode_literals - import json import sys import textwrap - -from .. import blame -from .. import format -from .. import gravatar from ..localization import N_ -from .. import terminal +from .. import blame, format, gravatar, terminal from .outputable import Outputable diff --git a/gitinspector/output/changesoutput.py b/gitinspector/output/changesoutput.py index f654984..65c0e82 100644 --- a/gitinspector/output/changesoutput.py +++ b/gitinspector/output/changesoutput.py @@ -19,15 +19,10 @@ from __future__ import print_function from __future__ import unicode_literals - import json import textwrap - -from .. import changes -from .. import format -from .. import gravatar from ..localization import N_ -from .. import terminal +from .. import changes, format, gravatar, terminal from .outputable import Outputable diff --git a/gitinspector/output/extensionsoutput.py b/gitinspector/output/extensionsoutput.py index 2be4f3a..ddf15cc 100644 --- a/gitinspector/output/extensionsoutput.py +++ b/gitinspector/output/extensionsoutput.py @@ -19,13 +19,9 @@ from __future__ import print_function from __future__ import unicode_literals - import textwrap - -from .. import extensions from ..localization import N_ -from .. import terminal - +from .. import extensions, terminal from .outputable import Outputable diff --git a/gitinspector/output/filteringoutput.py b/gitinspector/output/filteringoutput.py index ab194b8..3019803 100644 --- a/gitinspector/output/filteringoutput.py +++ b/gitinspector/output/filteringoutput.py @@ -20,9 +20,8 @@ from __future__ import print_function from __future__ import unicode_literals import textwrap - -from ..filtering import __filters__, has_filtered from ..localization import N_ +from ..filtering import __filters__, has_filtered from .. import terminal from .outputable import Outputable diff --git a/gitinspector/output/metricsoutput.py b/gitinspector/output/metricsoutput.py index f031f30..bb02885 100644 --- a/gitinspector/output/metricsoutput.py +++ b/gitinspector/output/metricsoutput.py @@ -19,7 +19,6 @@ from __future__ import print_function from __future__ import unicode_literals - from ..localization import N_ from .. import metrics from .outputable import Outputable diff --git a/gitinspector/output/responsibilitiesoutput.py b/gitinspector/output/responsibilitiesoutput.py index 3dada72..93761a5 100644 --- a/gitinspector/output/responsibilitiesoutput.py +++ b/gitinspector/output/responsibilitiesoutput.py @@ -19,19 +19,12 @@ from __future__ import print_function from __future__ import unicode_literals - import textwrap - -from .. import blame -from .. import changes -from .. import format -from .. import gravatar from ..localization import N_ +from .. import blame, changes, format, gravatar, terminal from .. import responsibilities as resp -from .. import terminal from .outputable import Outputable - RESPONSIBILITIES_INFO_TEXT = N_("The following repsonsibilties, by author, were found in the current " "revision of the repository (comments are exluded from the line count, " "if possible)") diff --git a/gitinspector/output/timelineoutput.py b/gitinspector/output/timelineoutput.py index 30e6908..7c2fbac 100644 --- a/gitinspector/output/timelineoutput.py +++ b/gitinspector/output/timelineoutput.py @@ -19,14 +19,9 @@ from __future__ import print_function from __future__ import unicode_literals - import textwrap - -from .. import format -from .. import gravatar from ..localization import N_ -from .. import terminal -from .. import timeline +from .. import format, gravatar, terminal, timeline from .outputable import Outputable TIMELINE_INFO_TEXT = N_("The following history timeline has been gathered from the repository") diff --git a/gitinspector/responsibilities.py b/gitinspector/responsibilities.py index af2dc85..ebe5210 100644 --- a/gitinspector/responsibilities.py +++ b/gitinspector/responsibilities.py @@ -19,9 +19,7 @@ from __future__ import print_function from __future__ import unicode_literals - -from . import blame -from . import changes +from . import blame, changes class ResponsibiltyEntry(object): blames = {} diff --git a/gitinspector/version.py b/gitinspector/version.py index 6691996..5107f86 100644 --- a/gitinspector/version.py +++ b/gitinspector/version.py @@ -19,11 +19,9 @@ from __future__ import print_function from __future__ import unicode_literals - from . import localization localization.init() - __version__ = "0.4.3dev" __doc__ = _("""Copyright © 2012-2015 Ejwa Software. All rights reserved.