<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12193">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trx_toolkit: merge copyright.py into app_common.py<br><br>Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5<br>---<br>M src/target/trx_toolkit/app_common.py<br>M src/target/trx_toolkit/burst_gen.py<br>M src/target/trx_toolkit/burst_send.py<br>M src/target/trx_toolkit/clck_gen.py<br>D src/target/trx_toolkit/copyright.py<br>M src/target/trx_toolkit/ctrl_cmd.py<br>M src/target/trx_toolkit/fake_trx.py<br>M src/target/trx_toolkit/trx_sniff.py<br>8 files changed, 25 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/93/12193/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/trx_toolkit/app_common.py b/src/target/trx_toolkit/app_common.py</span><br><span>index ed6878f..146956b 100644</span><br><span>--- a/src/target/trx_toolkit/app_common.py</span><br><span>+++ b/src/target/trx_toolkit/app_common.py</span><br><span>@@ -29,6 +29,17 @@</span><br><span> # Example: [DEBUG] ctrl_if_bts.py:71 Recv POWEROFF cmd</span><br><span> LOG_FMT_DEFAULT = "[%(levelname)s] %(filename)s:%(lineno)d %(message)s"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def app_print_copyright(self, holders = []):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Print copyright holders if any</span><br><span style="color: hsl(120, 100%, 40%);">+ for date, author in holders:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Copyright (C) %s by %s" % (date, author))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Print the license header itself</span><br><span style="color: hsl(120, 100%, 40%);">+ print("License GPLv2+: GNU GPL version 2 or later " \</span><br><span style="color: hsl(120, 100%, 40%);">+ "<http://gnu.org/licenses/gpl.html>\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "This is free software: you are free to change and redistribute it.\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "There is NO WARRANTY, to the extent permitted by law.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def app_init_logging(self, argv):</span><br><span> # Default logging handler (stderr)</span><br><span> sh = log.StreamHandler()</span><br><span>diff --git a/src/target/trx_toolkit/burst_gen.py b/src/target/trx_toolkit/burst_gen.py</span><br><span>index 1c18b3c..b62f48c 100755</span><br><span>--- a/src/target/trx_toolkit/burst_gen.py</span><br><span>+++ b/src/target/trx_toolkit/burst_gen.py</span><br><span>@@ -23,8 +23,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from copyright import print_copyright</span><br><span style="color: hsl(0, 100%, 40%);">-CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -40,7 +39,7 @@</span><br><span> </span><br><span> class Application(ApplicationBase):</span><br><span> def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print_copyright(CR_HOLDERS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.app_print_copyright(APP_CR_HOLDERS)</span><br><span> self.argv = self.parse_argv()</span><br><span> </span><br><span> # Set up signal handlers</span><br><span>diff --git a/src/target/trx_toolkit/burst_send.py b/src/target/trx_toolkit/burst_send.py</span><br><span>index 16db222..3745b39 100755</span><br><span>--- a/src/target/trx_toolkit/burst_send.py</span><br><span>+++ b/src/target/trx_toolkit/burst_send.py</span><br><span>@@ -22,8 +22,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from copyright import print_copyright</span><br><span style="color: hsl(0, 100%, 40%);">-CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -38,7 +37,7 @@</span><br><span> </span><br><span> class Application(ApplicationBase):</span><br><span> def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print_copyright(CR_HOLDERS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.app_print_copyright(APP_CR_HOLDERS)</span><br><span> self.argv = self.parse_argv()</span><br><span> </span><br><span> # Set up signal handlers</span><br><span>diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py</span><br><span>index 56207f4..40964dd 100755</span><br><span>--- a/src/target/trx_toolkit/clck_gen.py</span><br><span>+++ b/src/target/trx_toolkit/clck_gen.py</span><br><span>@@ -22,14 +22,14 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from copyright import print_copyright</span><br><span style="color: hsl(0, 100%, 40%);">-CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span> import time</span><br><span> import sys</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+from app_common import ApplicationBase</span><br><span> from threading import Timer</span><br><span> from udp_link import UDPLink</span><br><span> from gsm_shared import *</span><br><span>@@ -94,10 +94,10 @@</span><br><span> self.timer.start()</span><br><span> </span><br><span> # Just a wrapper for independent usage</span><br><span style="color: hsl(0, 100%, 40%);">-class Application:</span><br><span style="color: hsl(120, 100%, 40%);">+class Application(ApplicationBase):</span><br><span> def __init__(self):</span><br><span> # Print copyright</span><br><span style="color: hsl(0, 100%, 40%);">- print_copyright(CR_HOLDERS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.app_print_copyright(APP_CR_HOLDERS)</span><br><span> </span><br><span> # Set up signal handlers</span><br><span> signal.signal(signal.SIGINT, self.sig_handler)</span><br><span>diff --git a/src/target/trx_toolkit/copyright.py b/src/target/trx_toolkit/copyright.py</span><br><span>deleted file mode 100644</span><br><span>index 3d3597f..0000000</span><br><span>--- a/src/target/trx_toolkit/copyright.py</span><br><span>+++ /dev/null</span><br><span>@@ -1,13 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python2</span><br><span style="color: hsl(0, 100%, 40%);">-# -*- coding: utf-8 -*-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-def print_copyright(holders = []):</span><br><span style="color: hsl(0, 100%, 40%);">- # Print copyright holders if any</span><br><span style="color: hsl(0, 100%, 40%);">- for date, author in holders:</span><br><span style="color: hsl(0, 100%, 40%);">- print("Copyright (C) %s by %s" % (date, author))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Print the license header itself</span><br><span style="color: hsl(0, 100%, 40%);">- print("License GPLv2+: GNU GPL version 2 or later " \</span><br><span style="color: hsl(0, 100%, 40%);">- "<http://gnu.org/licenses/gpl.html>\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "This is free software: you are free to change and redistribute it.\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "There is NO WARRANTY, to the extent permitted by law.\n")</span><br><span>diff --git a/src/target/trx_toolkit/ctrl_cmd.py b/src/target/trx_toolkit/ctrl_cmd.py</span><br><span>index ffc3e46..28815c2 100755</span><br><span>--- a/src/target/trx_toolkit/ctrl_cmd.py</span><br><span>+++ b/src/target/trx_toolkit/ctrl_cmd.py</span><br><span>@@ -23,8 +23,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from copyright import print_copyright</span><br><span style="color: hsl(0, 100%, 40%);">-CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -37,7 +36,7 @@</span><br><span> </span><br><span> class Application(ApplicationBase):</span><br><span> def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print_copyright(CR_HOLDERS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.app_print_copyright(APP_CR_HOLDERS)</span><br><span> self.argv = self.parse_argv()</span><br><span> </span><br><span> # Set up signal handlers</span><br><span>diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py</span><br><span>index a45ce20..d73b566 100755</span><br><span>--- a/src/target/trx_toolkit/fake_trx.py</span><br><span>+++ b/src/target/trx_toolkit/fake_trx.py</span><br><span>@@ -22,8 +22,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from copyright import print_copyright</span><br><span style="color: hsl(0, 100%, 40%);">-CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2017-2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -42,7 +41,7 @@</span><br><span> </span><br><span> class Application(ApplicationBase):</span><br><span> def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print_copyright(CR_HOLDERS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.app_print_copyright(APP_CR_HOLDERS)</span><br><span> self.argv = self.parse_argv()</span><br><span> </span><br><span> # Set up signal handlers</span><br><span>diff --git a/src/target/trx_toolkit/trx_sniff.py b/src/target/trx_toolkit/trx_sniff.py</span><br><span>index 7a87351..e169c72 100755</span><br><span>--- a/src/target/trx_toolkit/trx_sniff.py</span><br><span>+++ b/src/target/trx_toolkit/trx_sniff.py</span><br><span>@@ -22,8 +22,7 @@</span><br><span> # with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span> # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from copyright import print_copyright</span><br><span style="color: hsl(0, 100%, 40%);">-CR_HOLDERS = [("2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span style="color: hsl(120, 100%, 40%);">+APP_CR_HOLDERS = [("2018", "Vadim Yanitskiy <axilirator@gmail.com>")]</span><br><span> </span><br><span> import logging as log</span><br><span> import signal</span><br><span>@@ -48,7 +47,7 @@</span><br><span> lo_trigger = False</span><br><span> </span><br><span> def __init__(self):</span><br><span style="color: hsl(0, 100%, 40%);">- print_copyright(CR_HOLDERS)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.app_print_copyright(APP_CR_HOLDERS)</span><br><span> self.argv = self.parse_argv()</span><br><span> </span><br><span> # Configure logging</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12193">change 12193</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/12193"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8b70ec2dd08cb2ffed733d2c4e1215b094f8d3d5 </div>
<div style="display:none"> Gerrit-Change-Number: 12193 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>