<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9818">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't enforce Python 2 for utilities<br><br>The conv_gen.py utility was tested against both Python 2 and 3,<br>so there is no need to enforce Python 2. Also, having:<br><br>  #!/usr/local/bin/python{2|3}<br><br>is a bad idea, because Python may be installed in a different location.<br><br>Change-Id: I6007d481047b584db13d6eda70fb99f11f9ddaa1<br>---<br>M include/Makefile.am<br>M src/gsm/Makefile.am<br>M tests/Makefile.am<br>M utils/conv_codes_gsm.py<br>M utils/conv_gen.py<br>5 files changed, 6 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/18/9818/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/Makefile.am b/include/Makefile.am</span><br><span>index 27a4090..38ba14c 100644</span><br><span>--- a/include/Makefile.am</span><br><span>+++ b/include/Makefile.am</span><br><span>@@ -162,7 +162,7 @@</span><br><span>     $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@</span><br><span> </span><br><span> osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py</span><br><span style="color: hsl(0, 100%, 40%);">-  $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_header gsm \</span><br><span style="color: hsl(120, 100%, 40%);">+   $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \</span><br><span>           --target-path $(builddir)/osmocom/gsm</span><br><span> </span><br><span> CLEANFILES = osmocom/gsm/gsm0503.h</span><br><span>diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am</span><br><span>index 0439ce6..5387e3a 100644</span><br><span>--- a/src/gsm/Makefile.am</span><br><span>+++ b/src/gsm/Makefile.am</span><br><span>@@ -47,6 +47,6 @@</span><br><span> </span><br><span> # Convolutional codes generation</span><br><span> gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py</span><br><span style="color: hsl(0, 100%, 40%);">-   $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_codes gsm</span><br><span style="color: hsl(120, 100%, 40%);">+      $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm</span><br><span> </span><br><span> CLEANFILES = gsm0503_conv.c</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 70b5cb8..db4e520 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -280,5 +280,5 @@</span><br><span>    mv $@.tmp $@</span><br><span> </span><br><span> conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py</span><br><span style="color: hsl(0, 100%, 40%);">-  $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \</span><br><span style="color: hsl(120, 100%, 40%);">+  $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \</span><br><span>          --target-path $(builddir)/conv</span><br><span>diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py</span><br><span>index eeed4fd..ec77660 100644</span><br><span>--- a/utils/conv_codes_gsm.py</span><br><span>+++ b/utils/conv_codes_gsm.py</span><br><span>@@ -1,5 +1,6 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python</span><br><span> # -*- coding: utf-8 -*-</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> from conv_gen import ConvolutionalCode</span><br><span> from conv_gen import poly</span><br><span> </span><br><span>diff --git a/utils/conv_gen.py b/utils/conv_gen.py</span><br><span>index 6b6b267..06283d8 100644</span><br><span>--- a/utils/conv_gen.py</span><br><span>+++ b/utils/conv_gen.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python</span><br><span> </span><br><span> mod_license = """</span><br><span> /*</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9818">change 9818</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/9818"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6007d481047b584db13d6eda70fb99f11f9ddaa1 </div>
<div style="display:none"> Gerrit-Change-Number: 9818 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>