Restructured imports slightly.

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()
 

gitinspector/changes.py

@@ -23,11 +23,7 @@ import multiprocessing
 import os
 import subprocess
 import threading
-
+from . import extensions, filtering, interval
-from . import extensions
-from . import filtering
-from . import interval
-
 
 CHANGES_PER_THREAD = 200
 NUM_THREADS = multiprocessing.cpu_count()

gitinspector/clone.py

@@ -18,7 +18,6 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
-
 import shutil
 import subprocess
 import sys

gitinspector/config.py

@@ -18,15 +18,9 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
-
 import os
 import subprocess
-
+from . import extensions, filtering, format, interval, optval
-from . import extensions
-from . import filtering
-from . import format
-from . import interval
-from . import optval
 
 def __read_git_config__(repo, variable):
 	previous_directory = os.getcwd()

gitinspector/format.py

@@ -24,12 +24,7 @@ import os
 import textwrap
 import time
 import zipfile
-
+from . import basedir, localization, terminal, version
-from . import basedir
-from . import localization
-from . import terminal
-from . import version
-
 
 __available_formats__ = ["html", "htmlembedded", "text", "xml"]
 

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, changes, clone, config, extensions, filtering, format, help, interval,
-from . import basedir
+               localization, optval, terminal, version)
-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 .output import outputable
 from .output.blameoutput import BlameOutput
 from .output.changesoutput import ChangesOutput

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__
 

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

gitinspector/metrics.py

@@ -18,14 +18,10 @@
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
-
 import re
 import subprocess
-
 from .changes import FileDiff
-from . import comment
+from . import comment, filtering, interval
-from . import filtering
-from . import 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}

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
 
 

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
 
 

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
 
 

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
 

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

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)")

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 format, gravatar, terminal, timeline
-from .. import timeline
 from .outputable import Outputable
 
 TIMELINE_INFO_TEXT = N_("The following history timeline has been gathered from the repository")

gitinspector/responsibilities.py

@@ -19,9 +19,7 @@
 
 from __future__ import print_function
 from __future__ import unicode_literals
-
+from . import blame, changes
-from . import blame
-from . import changes
 
 class ResponsibiltyEntry(object):
 	blames = {}

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.