<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libusrp/+/19675">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">migrate to python3<br><br>Let's move to python3, it's 2020 and the conversion seemed<br>actually rather trivial (famous last words).<br><br>Change-Id: Ib1604b36c32630e1360e06567cbd5f63a78df547<br>---<br>M contrib/libusrp.spec.in<br>M debian/control<br>M firmware/include/generate_regs.py<br>M firmware/src/common/build_eeprom.py<br>M firmware/src/common/edit-gpif<br>M firmware/src/usrp2/edit-gpif<br>6 files changed, 13 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/75/19675/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/libusrp.spec.in b/contrib/libusrp.spec.in</span><br><span>index 75ceeaa..c72868e 100644</span><br><span>--- a/contrib/libusrp.spec.in</span><br><span>+++ b/contrib/libusrp.spec.in</span><br><span>@@ -32,7 +32,7 @@</span><br><span> %if 0%{?suse_version} < 1320</span><br><span> BuildRequires: python</span><br><span> %else</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: python2</span><br><span style="color: hsl(120, 100%, 40%);">+BuildRequires: python3</span><br><span> %endif</span><br><span> BuildRequires: pkgconfig(libusb-1.0)</span><br><span> %if 0%{?suse_version} > 1325</span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index 247a661..cb3b90d 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -9,7 +9,7 @@</span><br><span> doxygen,</span><br><span> libtool,</span><br><span> pkg-config,</span><br><span style="color: hsl(0, 100%, 40%);">- python,</span><br><span style="color: hsl(120, 100%, 40%);">+ python3,</span><br><span> sdcc,</span><br><span> libusb-1.0-0-dev,</span><br><span> libboost-all-dev</span><br><span>diff --git a/firmware/include/generate_regs.py b/firmware/include/generate_regs.py</span><br><span>index f11baad..7416302 100755</span><br><span>--- a/firmware/include/generate_regs.py</span><br><span>+++ b/firmware/include/generate_regs.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> </span><br><span> import os, os.path</span><br><span> import re</span><br><span>@@ -8,7 +8,7 @@</span><br><span> # set srcdir to the directory that contains Makefile.am</span><br><span> try:</span><br><span> srcdir = os.environ['srcdir']</span><br><span style="color: hsl(0, 100%, 40%);">-except KeyError, e:</span><br><span style="color: hsl(120, 100%, 40%);">+except KeyError as e:</span><br><span> srcdir = "."</span><br><span> srcdir = srcdir + '/'</span><br><span> </span><br><span>diff --git a/firmware/src/common/build_eeprom.py b/firmware/src/common/build_eeprom.py</span><br><span>index 6092d61..3036d99 100755</span><br><span>--- a/firmware/src/common/build_eeprom.py</span><br><span>+++ b/firmware/src/common/build_eeprom.py</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python2</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> #</span><br><span> # Copyright 2004,2006 Free Software Foundation, Inc.</span><br><span> # </span><br><span>@@ -24,6 +24,7 @@</span><br><span> import sys</span><br><span> import os, os.path</span><br><span> from optparse import OptionParser</span><br><span style="color: hsl(120, 100%, 40%);">+from functools import reduce</span><br><span> </span><br><span> # USB Vendor and Product ID's</span><br><span> </span><br><span>@@ -33,7 +34,7 @@</span><br><span> </span><br><span> def hex_to_bytes (s):</span><br><span> if len (s) & 0x1:</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError, "Length must be even"</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Length must be even")</span><br><span> r = []</span><br><span> for i in range (0, len(s), 2):</span><br><span> r.append (int (s[i:i+2], 16))</span><br><span>@@ -59,17 +60,17 @@</span><br><span> for line in file:</span><br><span> line = line.strip().upper ()</span><br><span> if not self.pat.match (line):</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError, "Invalid hex record format"</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Invalid hex record format")</span><br><span> bytes = hex_to_bytes (line[1:])</span><br><span> sum = reduce (lambda x, y: x + y, bytes, 0) % 256</span><br><span> if sum != 0:</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError, "Bad hex checksum"</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Bad hex checksum")</span><br><span> lenx = bytes[0]</span><br><span> addr = (bytes[1] << 8) + bytes[2]</span><br><span> type = bytes[3]</span><br><span> data = bytes[4:-1]</span><br><span> if lenx != len (data):</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError, "Invalid hex record (bad length)"</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError("Invalid hex record (bad length)")</span><br><span> if type != 0:</span><br><span> break;</span><br><span> r.append (ihx_rec (addr, type, data))</span><br><span>@@ -153,7 +154,7 @@</span><br><span> i2c_addr = 0x50</span><br><span> rom_addr = 0x00</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- hex_image = map (lambda x : "%02x" % (x,), image)</span><br><span style="color: hsl(120, 100%, 40%);">+ hex_image = ["%02x" % (x,) for x in image]</span><br><span> </span><br><span> while (len (hex_image) > 0):</span><br><span> l = min (len (hex_image), 16)</span><br><span>diff --git a/firmware/src/common/edit-gpif b/firmware/src/common/edit-gpif</span><br><span>index 87e16eb..1a63791 100755</span><br><span>--- a/firmware/src/common/edit-gpif</span><br><span>+++ b/firmware/src/common/edit-gpif</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> # -*- Python -*-</span><br><span> #</span><br><span> # Copyright 2003 Free Software Foundation, Inc.</span><br><span>diff --git a/firmware/src/usrp2/edit-gpif b/firmware/src/usrp2/edit-gpif</span><br><span>index 87e16eb..1a63791 100755</span><br><span>--- a/firmware/src/usrp2/edit-gpif</span><br><span>+++ b/firmware/src/usrp2/edit-gpif</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/usr/bin/env python</span><br><span style="color: hsl(120, 100%, 40%);">+#!/usr/bin/env python3</span><br><span> # -*- Python -*-</span><br><span> #</span><br><span> # Copyright 2003 Free Software Foundation, Inc.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libusrp/+/19675">change 19675</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/c/libusrp/+/19675"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libusrp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib1604b36c32630e1360e06567cbd5f63a78df547 </div>
<div style="display:none"> Gerrit-Change-Number: 19675 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>