<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11067">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">First round of clean-ups of imports and unused variables<br><br>Run pyflakes src/osmo_gsm_tester and then address the first<br>round of problems.<br><br>Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0<br>---<br>M src/osmo_gsm_tester/bts.py<br>M src/osmo_gsm_tester/bts_nanobts.py<br>M src/osmo_gsm_tester/bts_octphy.py<br>M src/osmo_gsm_tester/bts_osmo.py<br>M src/osmo_gsm_tester/bts_osmotrx.py<br>M src/osmo_gsm_tester/esme.py<br>M src/osmo_gsm_tester/modem.py<br>M src/osmo_gsm_tester/pcu_osmo.py<br>M src/osmo_gsm_tester/report.py<br>M src/osmo_gsm_tester/smsc.py<br>M src/osmo_gsm_tester/suite.py<br>11 files changed, 11 insertions(+), 25 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/11067/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts.py b/src/osmo_gsm_tester/bts.py</span><br><span>index 041b2bc..3c22fb6 100644</span><br><span>--- a/src/osmo_gsm_tester/bts.py</span><br><span>+++ b/src/osmo_gsm_tester/bts.py</span><br><span>@@ -17,12 +17,9 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-import os</span><br><span style="color: hsl(0, 100%, 40%);">-import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-import tempfile</span><br><span> import copy</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, schema, pcu_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, schema</span><br><span> </span><br><span> class Bts(log.Origin, metaclass=ABCMeta):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>index a18f205..bec2433 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>@@ -18,11 +18,8 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> import os</span><br><span style="color: hsl(0, 100%, 40%);">-import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-import tempfile</span><br><span> import re</span><br><span style="color: hsl(0, 100%, 40%);">-from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, pcap_recorder, bts, pcu</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, process, pcap_recorder, bts, pcu</span><br><span> from . import powersupply</span><br><span> from .event_loop import MainLoop</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/bts_octphy.py b/src/osmo_gsm_tester/bts_octphy.py</span><br><span>index f1a0ce8..a1dd494 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_octphy.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_octphy.py</span><br><span>@@ -19,8 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-import tempfile</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, pcu_osmo, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, template, process, bts_osmo</span><br><span> </span><br><span> class OsmoBtsOctphy(bts_osmo.OsmoBtsMainUnit):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmo.py b/src/osmo_gsm_tester/bts_osmo.py</span><br><span>index 32784bd..361eb20 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmo.py</span><br><span>@@ -18,10 +18,9 @@</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span> import os</span><br><span style="color: hsl(0, 100%, 40%);">-import pprint</span><br><span> import tempfile</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, bts, pcu_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, bts, pcu_osmo</span><br><span> </span><br><span> class OsmoBts(bts.Bts, metaclass=ABCMeta):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>index e7e3542..910f4a1 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_osmotrx.py</span><br><span>@@ -19,9 +19,8 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-import tempfile</span><br><span> from abc import ABCMeta, abstractmethod</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, pcu_osmo, bts_osmo</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config, util, template, process, bts_osmo</span><br><span> from .event_loop import MainLoop</span><br><span> </span><br><span> class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):</span><br><span>diff --git a/src/osmo_gsm_tester/esme.py b/src/osmo_gsm_tester/esme.py</span><br><span>index 9653fbf..de3ac16 100644</span><br><span>--- a/src/osmo_gsm_tester/esme.py</span><br><span>+++ b/src/osmo_gsm_tester/esme.py</span><br><span>@@ -23,7 +23,7 @@</span><br><span> import smpplib.consts</span><br><span> import smpplib.exceptions</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, util, sms</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log</span><br><span> from .event_loop import MainLoop</span><br><span> </span><br><span> # if you want to know what's happening inside python-smpplib</span><br><span>diff --git a/src/osmo_gsm_tester/modem.py b/src/osmo_gsm_tester/modem.py</span><br><span>index d0bbf23..21b208c 100644</span><br><span>--- a/src/osmo_gsm_tester/modem.py</span><br><span>+++ b/src/osmo_gsm_tester/modem.py</span><br><span>@@ -21,9 +21,6 @@</span><br><span> from .event_loop import MainLoop</span><br><span> </span><br><span> from pydbus import SystemBus, Variant</span><br><span style="color: hsl(0, 100%, 40%);">-import time</span><br><span style="color: hsl(0, 100%, 40%);">-import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-import sys</span><br><span> </span><br><span> # Required for Gio.Cancellable.</span><br><span> # See https://lazka.github.io/pgi-docs/Gio-2.0/classes/Cancellable.html#Gio.Cancellable</span><br><span>diff --git a/src/osmo_gsm_tester/pcu_osmo.py b/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>index ad8ebce..767264c 100644</span><br><span>--- a/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>+++ b/src/osmo_gsm_tester/pcu_osmo.py</span><br><span>@@ -19,8 +19,7 @@</span><br><span> </span><br><span> import os</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-import tempfile</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process, pcu</span><br><span style="color: hsl(120, 100%, 40%);">+from . import config, util, template, process, pcu</span><br><span> </span><br><span> class OsmoPcu(pcu.Pcu):</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/report.py b/src/osmo_gsm_tester/report.py</span><br><span>index a53504b..224cc46 100644</span><br><span>--- a/src/osmo_gsm_tester/report.py</span><br><span>+++ b/src/osmo_gsm_tester/report.py</span><br><span>@@ -17,11 +17,10 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-import os</span><br><span> import math</span><br><span> from datetime import datetime</span><br><span> import xml.etree.ElementTree as et</span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, suite, test</span><br><span style="color: hsl(120, 100%, 40%);">+from . import test</span><br><span> </span><br><span> def trial_to_junit_write(trial, junit_path):</span><br><span> elements = et.ElementTree(element=trial_to_junit(trial))</span><br><span>@@ -53,7 +52,7 @@</span><br><span> testcase.set('name', t.name())</span><br><span> testcase.set('time', str(math.ceil(t.duration)))</span><br><span> if t.status == test.Test.SKIP:</span><br><span style="color: hsl(0, 100%, 40%);">- skip = et.SubElement(testcase, 'skipped')</span><br><span style="color: hsl(120, 100%, 40%);">+ et.SubElement(testcase, 'skipped')</span><br><span> elif t.status == test.Test.FAIL:</span><br><span> failure = et.SubElement(testcase, 'failure')</span><br><span> failure.set('type', t.fail_type or 'failure')</span><br><span>diff --git a/src/osmo_gsm_tester/smsc.py b/src/osmo_gsm_tester/smsc.py</span><br><span>index 1a0859c..d154801 100644</span><br><span>--- a/src/osmo_gsm_tester/smsc.py</span><br><span>+++ b/src/osmo_gsm_tester/smsc.py</span><br><span>@@ -17,7 +17,7 @@</span><br><span> # You should have received a copy of the GNU Affero General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from . import log, config, util, template, process</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log, config</span><br><span> </span><br><span> class Smsc:</span><br><span> </span><br><span>diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py</span><br><span>index 3a49574..932a6ab 100644</span><br><span>--- a/src/osmo_gsm_tester/suite.py</span><br><span>+++ b/src/osmo_gsm_tester/suite.py</span><br><span>@@ -21,7 +21,7 @@</span><br><span> import sys</span><br><span> import time</span><br><span> import pprint</span><br><span style="color: hsl(0, 100%, 40%);">-from . import config, log, template, util, resource, schema, test</span><br><span style="color: hsl(120, 100%, 40%);">+from . import config, log, util, resource, test</span><br><span> from .event_loop import MainLoop</span><br><span> from . import osmo_nitb, osmo_hlr, osmo_mgcpgw, osmo_mgw, osmo_msc, osmo_bsc, osmo_stp, osmo_ggsn, osmo_sgsn, modem, esme, osmocon</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11067">change 11067</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11067"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I02f1d89078dfdf37d53e2e20811bf36fb14ec3b0 </div>
<div style="display:none"> Gerrit-Change-Number: 11067 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>