From eea71144d64063e086fba33b740884367f0f9ff5 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Oct 2018 11:39:20 +0100
Subject: [PATCH] python3: More code cleanup

No functional changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/backend/accounts.py      |  3 ++-
 src/backend/database.py      |  4 ----
 src/backend/fireinfo.py      |  2 --
 src/backend/iuse.py          | 35 -----------------------------------
 src/backend/mirrors.py       |  2 --
 src/backend/releases.py      |  3 +--
 src/backend/tracker.py       |  2 --
 src/backend/util.py          |  2 --
 src/backend/zeiterfassung.py |  1 -
 src/web/auth.py              |  1 -
 src/web/handlers_base.py     |  2 --
 11 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 2449658d..752dff8a 100644
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -6,7 +6,8 @@ import io
 import hashlib
 import ldap
 import logging
-import urllib.request, urllib.parse, urllib.error
+import urllib.parse
+import urllib.request
 
 from .misc import Object
 
diff --git a/src/backend/database.py b/src/backend/database.py
index ed64727c..f79cf128 100644
--- a/src/backend/database.py
+++ b/src/backend/database.py
@@ -8,12 +8,8 @@
 	as torndb.
 """
 
-import copy
-import itertools
 import logging
-import os
 import psycopg2
-import time
 
 class Connection(object):
 	"""
diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index 0fbbbc40..f84df7ad 100644
--- a/src/backend/fireinfo.py
+++ b/src/backend/fireinfo.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 import datetime
 import hwdata
 import iso3166
diff --git a/src/backend/iuse.py b/src/backend/iuse.py
index bc0812dc..a3c0c572 100644
--- a/src/backend/iuse.py
+++ b/src/backend/iuse.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 import io
 import logging
 import os.path
@@ -102,39 +100,6 @@ class ImageObject(Object):
 		return self.request.locale
 
 
-#class Image1(ImageObject):
-#	id = 0
-#
-#	default_size = 500, 50
-#
-#	def draw(self):
-#		# Background
-#		self.paint.rectangle(((0, 0), self.default_size), fill="#000000")
-#
-#		# Release information
-#		self.paint.text((10, 10), "%s" % self.profile.release)
-#
-#		# Hardware information
-#		hw = [
-#			self.profile.cpu.model_string,
-#			"Mem: %.1fG" % (self.profile.memory / 1024**2),
-#		]
-#
-#		if self.profile.virtual:
-#			virt = "V-%s" % self.profile.hypervisor.vendor
-#			if self.profile.hypervisor.type == "para":
-#				virt = "%s-PV" % virt
-#			hw.append(virt)
-#
-#		if self.profile.cpu.capable_64bit:
-#			hw.append("64")
-#
-#		self.paint.text((10, 30), "%s" % " | ".join(hw))
-#
-#
-#IUse().add_imagetype(Image1)
-
-
 class Image1(ImageObject):
 	id = 0
 
diff --git a/src/backend/mirrors.py b/src/backend/mirrors.py
index 12d56c3a..0b743a79 100644
--- a/src/backend/mirrors.py
+++ b/src/backend/mirrors.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 import datetime
 import logging
 import math
diff --git a/src/backend/releases.py b/src/backend/releases.py
index 60377882..2ed6db05 100644
--- a/src/backend/releases.py
+++ b/src/backend/releases.py
@@ -4,7 +4,6 @@ import hashlib
 import logging
 import os
 import re
-import urllib.request, urllib.parse, urllib.error
 import urllib.parse
 
 from . import database
@@ -94,7 +93,7 @@ class File(Object):
 
 	@property
 	def url(self):
-                return urllib.parse.urljoin("https://downloads.ipfire.org", self.filename)
+		return urllib.parse.urljoin("https://downloads.ipfire.org", self.filename)
 
 	@property
 	def desc(self):
diff --git a/src/backend/tracker.py b/src/backend/tracker.py
index f2119676..7229905d 100644
--- a/src/backend/tracker.py
+++ b/src/backend/tracker.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 def ncode_hex(s):
 	return s.encode("hex")
 
diff --git a/src/backend/util.py b/src/backend/util.py
index 616ab878..bcd8ca56 100644
--- a/src/backend/util.py
+++ b/src/backend/util.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 def format_size(s):
 	units = ("B", "k", "M", "G", "T")
 
diff --git a/src/backend/zeiterfassung.py b/src/backend/zeiterfassung.py
index 6cd0dd0e..aa0173e2 100644
--- a/src/backend/zeiterfassung.py
+++ b/src/backend/zeiterfassung.py
@@ -5,7 +5,6 @@ import hmac
 import json
 import tornado.httpclient
 import tornado.gen
-import urllib.request, urllib.parse, urllib.error
 import urllib.parse
 
 from .misc import Object
diff --git a/src/web/auth.py b/src/web/auth.py
index 795a05c9..17957145 100644
--- a/src/web/auth.py
+++ b/src/web/auth.py
@@ -38,7 +38,6 @@ class AuthenticationMixin(object):
 			self.clear_cookie("session_id")
 
 
-
 class LoginHandler(AuthenticationMixin, base.BaseHandler):
 	def get(self):
 		next = self.get_argument("next", None)
diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index 7afaa798..4dce9fd2 100644
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -1,7 +1,5 @@
 #!/usr/bin/python
 
-
-
 import datetime
 import dateutil.parser
 import http.client
-- 
2.47.3