First round of clean-ups of imports and unused variables
Run pyflakes src/osmo_gsm_tester and then address the first
round of problems.
Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0
diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py
index f05a1ba..6b0331e 100644
--- a/src/osmo_gsm_tester/bts.py
+++ b/src/osmo_gsm_tester/bts.py
@@ -17,12 +17,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
-import pprint
-import tempfile
import copy
from abc import ABCMeta, abstractmethod
-from . import log, config, util, template, process, schema, pcu_osmo
+from . import log, config, schema
class Bts(log.Origin, metaclass=ABCMeta):
diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py
index a18f205..bec2433 100644
--- a/src/osmo_gsm_tester/bts_nanobts.py
+++ b/src/osmo_gsm_tester/bts_nanobts.py
@@ -18,11 +18,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
-import pprint
-import tempfile
import re
-from abc import ABCMeta, abstractmethod
-from . import log, config, util, template, process, pcap_recorder, bts, pcu
+from . import log, config, util, process, pcap_recorder, bts, pcu
from . import powersupply
from .event_loop import MainLoop
diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py
index f1a0ce8..a1dd494 100644
--- a/src/osmo_gsm_tester/bts_octphy.py
+++ b/src/osmo_gsm_tester/bts_octphy.py
@@ -19,8 +19,7 @@
import os
import pprint
-import tempfile
-from . import log, config, util, template, process, pcu_osmo, bts_osmo
+from . import log, config, util, template, process, bts_osmo
class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit):
diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py
index 89572ec..9105c28 100644
--- a/src/osmo_gsm_tester/bts_osmo.py
+++ b/src/osmo_gsm_tester/bts_osmo.py
@@ -18,10 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
-import pprint
import tempfile
from abc import ABCMeta, abstractmethod
-from . import log, config, util, template, process, bts, pcu_osmo
+from . import log, bts, pcu_osmo
class OsmoBts(bts.Bts, metaclass=ABCMeta):
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 92b726c..86afeec 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -20,9 +20,8 @@
import os
import stat
import pprint
-import tempfile
from abc import ABCMeta, abstractmethod
-from . import log, config, util, template, process, pcu_osmo, bts_osmo
+from . import log, config, util, template, process, bts_osmo
from .event_loop import MainLoop
class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):
diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py
index 9653fbf..de3ac16 100644
--- a/src/osmo_gsm_tester/esme.py
+++ b/src/osmo_gsm_tester/esme.py
@@ -23,7 +23,7 @@
import smpplib.consts
import smpplib.exceptions
-from . import log, util, sms
+from . import log
from .event_loop import MainLoop
# if you want to know what's happening inside python-smpplib
diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py
index d0bbf23..21b208c 100644
--- a/src/osmo_gsm_tester/modem.py
+++ b/src/osmo_gsm_tester/modem.py
@@ -21,9 +21,6 @@
from .event_loop import MainLoop
from pydbus import SystemBus, Variant
-import time
-import pprint
-import sys
# Required for Gio.Cancellable.
# See https://lazka.github.io/pgi-docs/Gio-2.0/classes/Cancellable.html#Gio.Cancellable
diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py
index ad8ebce..767264c 100644
--- a/src/osmo_gsm_tester/pcu_osmo.py
+++ b/src/osmo_gsm_tester/pcu_osmo.py
@@ -19,8 +19,7 @@
import os
import pprint
-import tempfile
-from . import log, config, util, template, process, pcu
+from . import config, util, template, process, pcu
class OsmoPcu(pcu.Pcu):
diff --git a/src/osmo_gsm_tester/report.py b/src/osmo_gsm_tester/report.py
index a53504b..224cc46 100644
--- a/src/osmo_gsm_tester/report.py
+++ b/src/osmo_gsm_tester/report.py
@@ -17,11 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import os
import math
from datetime import datetime
import xml.etree.ElementTree as et
-from . import log, suite, test
+from . import test
def trial_to_junit_write(trial, junit_path):
elements = et.ElementTree(element=trial_to_junit(trial))
@@ -53,7 +52,7 @@
testcase.set('name', t.name())
testcase.set('time', str(math.ceil(t.duration)))
if t.status == test.Test.SKIP:
- skip = et.SubElement(testcase, 'skipped')
+ et.SubElement(testcase, 'skipped')
elif t.status == test.Test.FAIL:
failure = et.SubElement(testcase, 'failure')
failure.set('type', t.fail_type or 'failure')
diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py
index 1a0859c..d154801 100644
--- a/src/osmo_gsm_tester/smsc.py
+++ b/src/osmo_gsm_tester/smsc.py
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from . import log, config, util, template, process
+from . import log, config
class Smsc:
diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index 3a49574..932a6ab 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -21,7 +21,7 @@
import sys
import time
import pprint
-from . import config, log, template, util, resource, schema, test
+from . import config, log, util, resource, test
from .event_loop import MainLoop
from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon