Updated to support Python3 using 2to3

gitinspector/blame.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import datetime
 import multiprocessing
 import re
@@ -141,9 +141,9 @@ class Blame(object):
 
 				if FileDiff.get_extension(row) in extensions.get_located() and \
 				   FileDiff.is_valid_extension(row) and not filtering.set_filtered(FileDiff.get_filename(row)):
-					blame_command = filter(None, ["git", "blame", "--line-porcelain", "-w"] + \
+					blame_command = [_f for _f in ["git", "blame", "--line-porcelain", "-w"] + \
 							(["-C", "-C", "-M"] if hard else []) +
-					                [interval.get_since(), interval.get_ref(), "--", row])
+					                [interval.get_since(), interval.get_ref(), "--", row] if _f]
 					thread = BlameThread(useweeks, changes, blame_command, FileDiff.get_extension(row),
 					                     self.blames, row.strip())
 					thread.daemon = True
@@ -190,7 +190,7 @@ class Blame(object):
 
 	def get_summed_blames(self):
 		summed_blames = {}
-		for i in self.blames.items():
+		for i in list(self.blames.items()):
 			if summed_blames.get(i[0][0], None) == None:
 				summed_blames[i[0][0]] = BlameEntry()
 

gitinspector/changes.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division
-from __future__ import unicode_literals
+
+
 import bisect
 import datetime
 import multiprocessing
@@ -122,10 +122,10 @@ class ChangesThread(threading.Thread):
 		thread.start()
 
 	def run(self):
-		git_log_r = subprocess.Popen(filter(None, ["git", "log", "--reverse", "--pretty=%ct|%cd|%H|%aN|%aE",
+		git_log_r = subprocess.Popen([_f for _f in ["git", "log", "--reverse", "--pretty=%ct|%cd|%H|%aN|%aE",
 		                             "--stat=100000,8192", "--no-merges", "-w", interval.get_since(),
 		                             interval.get_until(), "--date=short"] + (["-C", "-C", "-M"] if self.hard else []) +
-		                             [self.first_hash + self.second_hash]), bufsize=1, stdout=subprocess.PIPE).stdout
+		                             [self.first_hash + self.second_hash] if _f], bufsize=1, stdout=subprocess.PIPE).stdout
 		lines = git_log_r.readlines()
 		git_log_r.close()
 
@@ -185,8 +185,8 @@ class Changes(object):
 	def __init__(self, repo, hard):
 		self.commits = []
 		interval.set_ref("HEAD");
-		git_rev_list_p = subprocess.Popen(filter(None, ["git", "rev-list", "--reverse", "--no-merges",
-		                                  interval.get_since(), interval.get_until(), "HEAD"]), bufsize=1,
+		git_rev_list_p = subprocess.Popen([_f for _f in ["git", "rev-list", "--reverse", "--no-merges",
+		                                  interval.get_since(), interval.get_until(), "HEAD"] if _f], bufsize=1,
 		                                  stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 		lines = git_rev_list_p.communicate()[0].splitlines()
 		git_rev_list_p.stdout.close()

gitinspector/clone.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 import os
 import shutil
 import subprocess
@@ -27,7 +27,7 @@ import tempfile
 try:
 	from urllib.parse import urlparse
 except:
-	from urlparse import urlparse
+	from urllib.parse import urlparse
 
 __cloned_paths__ = []
 

gitinspector/comment.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 
 __comment_begining__ = {"java": "/*", "c": "/*", "cc": "/*", "cpp": "/*", "cs": "/*", "h": "/*", "hh": "/*", "hpp": "/*",
                         "hs": "{-", "html": "<!--", "php": "/*", "py": "\"\"\"", "glsl": "/*", "rb": "=begin", "js": "/*",

gitinspector/config.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # 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
@@ -31,8 +31,8 @@ class GitConfig(object):
 	def __read_git_config__(self, variable):
 		previous_directory = os.getcwd()
 		os.chdir(self.repo)
-		setting = subprocess.Popen(filter(None, ["git", "config", "--global" if self.global_only else "",
-		                           "inspector." + variable]), bufsize=1, stdout=subprocess.PIPE).stdout
+		setting = subprocess.Popen([_f for _f in ["git", "config", "--global" if self.global_only else "",
+		                           "inspector." + variable] if _f], bufsize=1, stdout=subprocess.PIPE).stdout
 		os.chdir(previous_directory)
 
 		try:

gitinspector/extensions.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 
 DEFAULT_EXTENSIONS = ["java", "c", "cc", "cpp", "h", "hh", "hpp", "py", "glsl", "rb", "js", "sql"]
 

gitinspector/filtering.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 import re
 import subprocess
 
@@ -58,7 +58,7 @@ def has_filtered():
 	return False
 
 def __find_commit_message__(sha):
-	git_show_r = subprocess.Popen(filter(None, ["git", "show", "-s", "--pretty=%B", "-w", sha]), bufsize=1,
+	git_show_r = subprocess.Popen([_f for _f in ["git", "show", "-s", "--pretty=%B", "-w", sha] if _f], bufsize=1,
 	                              stdout=subprocess.PIPE).stdout
 
 	commit_message = git_show_r.read()

gitinspector/format.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import base64
 import os
 import textwrap

gitinspector/gitinspector.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import atexit
 import getopt
 import os

gitinspector/gravatar.py

@@ -17,13 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 import hashlib
 
 try:
 	from urllib.parse import urlencode
 except:
-	from urllib import urlencode
+	from urllib.parse import urlencode
 
 from . import format
 

gitinspector/help.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import sys
 from .extensions import DEFAULT_EXTENSIONS
 from .format import __available_formats__

gitinspector/interval.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 
 try:
 	from shlex import quote

gitinspector/localization.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import gettext
 import locale
 import os

gitinspector/metrics.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 import re
 import subprocess
 from .changes import FileDiff

gitinspector/optval.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 import getopt
 
 class InvalidOptionArgument(Exception):

gitinspector/output/blameoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import json
 import sys
 import textwrap

gitinspector/output/changesoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import json
 import textwrap
 from ..localization import N_

gitinspector/output/extensionsoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import textwrap
 from ..localization import N_
 from .. import extensions, terminal

gitinspector/output/filteringoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import textwrap
 from ..localization import N_
 from ..filtering import __filters__, has_filtered

gitinspector/output/metricsoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 from ..changes import FileDiff
 from ..localization import N_
 from ..metrics import (__metric_eloc__, METRIC_CYCLOMATIC_COMPLEXITY_THRESHOLD, METRIC_CYCLOMATIC_COMPLEXITY_DENSITY_THRESHOLD)
@@ -48,17 +48,17 @@ class MetricsOutput(Outputable):
 
 		if self.metrics.eloc:
 			print("\n" + _(ELOC_INFO_TEXT) + ":")
-			for i in sorted(set([(j, i) for (i, j) in self.metrics.eloc.items()]), reverse=True):
+			for i in sorted(set([(j, i) for (i, j) in list(self.metrics.eloc.items())]), reverse=True):
 				print(_("{0} ({1} estimated lines of code)").format(i[1], str(i[0])))
 
 		if self.metrics.cyclomatic_complexity:
 			print("\n" + _(CYCLOMATIC_COMPLEXITY_TEXT) + ":")
-			for i in sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity.items()]), reverse=True):
+			for i in sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity.items())]), reverse=True):
 				print(_("{0} ({1} in cyclomatic complexity)").format(i[1], str(i[0])))
 
 		if self.metrics.cyclomatic_complexity_density:
 			print("\n" + _(CYCLOMATIC_COMPLEXITY_DENSITY_TEXT) + ":")
-			for i in sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity_density.items()]), reverse=True):
+			for i in sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity_density.items())]), reverse=True):
 				print(_("{0} ({1:.3f} in cyclomatic complexity density)").format(i[1], i[0]))
 
 	def output_html(self):
@@ -69,7 +69,7 @@ class MetricsOutput(Outputable):
 
 		if self.metrics.eloc:
 			metrics_xml += "<div><h4>" + _(ELOC_INFO_TEXT) + ".</h4>"
-			for num, i in enumerate(sorted(set([(j, i) for (i, j) in self.metrics.eloc.items()]), reverse=True)):
+			for num, i in enumerate(sorted(set([(j, i) for (i, j) in list(self.metrics.eloc.items())]), reverse=True)):
 				metrics_xml += "<div class=\"" + __get_metrics_score__(__metric_eloc__[FileDiff.get_extension(i[1])], i[0]) + \
 				               (" odd\">" if num % 2 == 1 else "\">") + \
 				               _("{0} ({1} estimated lines of code)").format(i[1], str(i[0])) + "</div>"
@@ -77,7 +77,7 @@ class MetricsOutput(Outputable):
 
 		if self.metrics.cyclomatic_complexity:
 			metrics_xml += "<div><h4>" +  _(CYCLOMATIC_COMPLEXITY_TEXT) + "</h4>"
-			for num, i in enumerate(sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity.items()]), reverse=True)):
+			for num, i in enumerate(sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity.items())]), reverse=True)):
 				metrics_xml += "<div class=\"" + __get_metrics_score__(METRIC_CYCLOMATIC_COMPLEXITY_THRESHOLD, i[0]) + \
 				               (" odd\">" if num % 2 == 1 else "\">") + \
 				               _("{0} ({1} in cyclomatic complexity)").format(i[1], str(i[0])) + "</div>"
@@ -85,7 +85,7 @@ class MetricsOutput(Outputable):
 
 		if self.metrics.cyclomatic_complexity_density:
 			metrics_xml += "<div><h4>" +  _(CYCLOMATIC_COMPLEXITY_DENSITY_TEXT) + "</h4>"
-			for num, i in enumerate(sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity_density.items()]), reverse=True)):
+			for num, i in enumerate(sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity_density.items())]), reverse=True)):
 				metrics_xml += "<div class=\"" + __get_metrics_score__(METRIC_CYCLOMATIC_COMPLEXITY_DENSITY_THRESHOLD, i[0]) + \
 				               (" odd\">" if num % 2 == 1 else "\">") + \
 				               _("{0} ({1:.3f} in cyclomatic complexity density)").format(i[1], i[0]) + "</div>"
@@ -101,7 +101,7 @@ class MetricsOutput(Outputable):
 			eloc_json = ""
 
 			if self.metrics.eloc:
-				for i in sorted(set([(j, i) for (i, j) in self.metrics.eloc.items()]), reverse=True):
+				for i in sorted(set([(j, i) for (i, j) in list(self.metrics.eloc.items())]), reverse=True):
 					eloc_json += "{\n\t\t\t\t\"type\": \"estimated-lines-of-code\",\n"
 					eloc_json += "\t\t\t\t\"file_name\": \"" + i[1] + "\",\n"
 					eloc_json += "\t\t\t\t\"value\": " + str(i[0]) + "\n"
@@ -111,7 +111,7 @@ class MetricsOutput(Outputable):
 						eloc_json = eloc_json[:-1]
 
 			if self.metrics.cyclomatic_complexity:
-				for i in sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity.items()]), reverse=True):
+				for i in sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity.items())]), reverse=True):
 					eloc_json += "{\n\t\t\t\t\"type\": \"cyclomatic-complexity\",\n"
 					eloc_json += "\t\t\t\t\"file_name\": \"" + i[1] + "\",\n"
 					eloc_json += "\t\t\t\t\"value\": " + str(i[0]) + "\n"
@@ -121,7 +121,7 @@ class MetricsOutput(Outputable):
 						eloc_json = eloc_json[:-1]
 
 			if self.metrics.cyclomatic_complexity_density:
-				for i in sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity_density.items()]), reverse=True):
+				for i in sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity_density.items())]), reverse=True):
 					eloc_json += "{\n\t\t\t\t\"type\": \"cyclomatic-complexity-density\",\n"
 					eloc_json += "\t\t\t\t\"file_name\": \"" + i[1] + "\",\n"
 					eloc_json += "\t\t\t\t\"value\": {0:.3f}\n".format(i[0])
@@ -137,21 +137,21 @@ class MetricsOutput(Outputable):
 			eloc_xml = ""
 
 			if self.metrics.eloc:
-				for i in sorted(set([(j, i) for (i, j) in self.metrics.eloc.items()]), reverse=True):
+				for i in sorted(set([(j, i) for (i, j) in list(self.metrics.eloc.items())]), reverse=True):
 					eloc_xml += "\t\t\t<estimated-lines-of-code>\n"
 					eloc_xml += "\t\t\t\t<file-name>" + i[1] + "</file-name>\n"
 					eloc_xml += "\t\t\t\t<value>" + str(i[0]) + "</value>\n"
 					eloc_xml += "\t\t\t</estimated-lines-of-code>\n"
 
 			if self.metrics.cyclomatic_complexity:
-				for i in sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity.items()]), reverse=True):
+				for i in sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity.items())]), reverse=True):
 					eloc_xml += "\t\t\t<cyclomatic-complexity>\n"
 					eloc_xml += "\t\t\t\t<file-name>" + i[1] + "</file-name>\n"
 					eloc_xml += "\t\t\t\t<value>" + str(i[0]) + "</value>\n"
 					eloc_xml += "\t\t\t</cyclomatic-complexity>\n"
 
 			if self.metrics.cyclomatic_complexity_density:
-				for i in sorted(set([(j, i) for (i, j) in self.metrics.cyclomatic_complexity_density.items()]), reverse=True):
+				for i in sorted(set([(j, i) for (i, j) in list(self.metrics.cyclomatic_complexity_density.items())]), reverse=True):
 					eloc_xml += "\t\t\t<cyclomatic-complexity-density>\n"
 					eloc_xml += "\t\t\t\t<file-name>" + i[1] + "</file-name>\n"
 					eloc_xml += "\t\t\t\t<value>{0:.3f}</value>\n".format(i[0])

gitinspector/output/outputable.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 from .. import format
 
 class Outputable(object):

gitinspector/output/responsibilitiesoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import textwrap
 from ..localization import N_
 from .. import format, gravatar, terminal

gitinspector/output/timelineoutput.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 import textwrap
 from ..localization import N_
 from .. import format, gravatar, terminal, timeline

gitinspector/responsibilities.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 
 class ResponsibiltyEntry(object):
 	blames = {}
@@ -28,7 +28,7 @@ class Responsibilities(object):
 	def get(blame, author_name):
 		author_blames = {}
 
-		for i in blame.blames.items():
+		for i in list(blame.blames.items()):
 			if author_name == i[0][0]:
 				total_rows = i[1].rows - i[1].comments
 				if total_rows > 0:

gitinspector/terminal.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
+
 import codecs
 import os
 import platform

gitinspector/timeline.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import unicode_literals
+
 import datetime
 
 class TimelineData(object):
@@ -63,7 +63,7 @@ class TimelineData(object):
 		return self.total_changes_by_period[period]
 
 	def get_authors(self):
-		return sorted(set([(i[0][0], self.changes.get_latest_email_by_author(i[0][0])) for i in self.entries.items()]))
+		return sorted(set([(i[0][0], self.changes.get_latest_email_by_author(i[0][0])) for i in list(self.entries.items())]))
 
 	def get_author_signs_in_period(self, author, period, multiplier):
 		authorinfo = self.entries.get((author, period), None)

gitinspector/version.py

@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with gitinspector. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
-from __future__ import unicode_literals
+
+
 from . import localization
 localization.init()