Date: Mon, 9 Dec 2019 08:33:39 +0000 (UTC) From: Koichiro Iwao <meta@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519596 - in head/sysutils/hatop: . files Message-ID: <201912090833.xB98Xd22042996@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: meta Date: Mon Dec 9 08:33:39 2019 New Revision: 519596 URL: https://svnweb.freebsd.org/changeset/ports/519596 Log: sysutils/hatop: Switch to Python 3.6+ and add patch to support Python 3 since Python 2 is EoL on January 1 2020. PR: 242413 Submitted by: maintainer Obtained from: https://github.com/feurix/hatop/pull/7 Added: head/sysutils/hatop/files/ head/sysutils/hatop/files/patch-bin_hatop (contents, props changed) Modified: head/sysutils/hatop/Makefile Modified: head/sysutils/hatop/Makefile ============================================================================== --- head/sysutils/hatop/Makefile Mon Dec 9 08:07:18 2019 (r519595) +++ head/sysutils/hatop/Makefile Mon Dec 9 08:33:39 2019 (r519596) @@ -3,18 +3,18 @@ PORTNAME= hatop PORTVERSION= 0.7.7 -PORTREVISION= 2 +PORTREVISION= 3 DISTVERSIONPREFIX= v CATEGORIES= sysutils net -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mikeg@bsd-box.net COMMENT= Interactive real-time monitoring tool for the HAProxy unix socket LICENSE= GPLv3+ RUN_DEPENDS= ${LOCALBASE}/sbin/haproxy:net/haproxy -USES= python:2.7 shebangfix +USES= python:3.6+ shebangfix SHEBANG_FILES= bin/hatop NO_BUILD= yes NO_ARCH= yes Added: head/sysutils/hatop/files/patch-bin_hatop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/hatop/files/patch-bin_hatop Mon Dec 9 08:33:39 2019 (r519596) @@ -0,0 +1,204 @@ +--- bin/hatop.orig 2019-12-03 21:58:07 UTC ++++ bin/hatop +@@ -414,16 +414,16 @@ class Socket: + # Enter the interactive socket mode. This requires HAProxy 1.4+ and + # allows us to error out early if connected to an older version. + try: +- self.send('prompt') ++ self.send(b'prompt') + self.wait() +- self.send('set timeout cli %d' % HAPROXY_CLI_TIMEOUT) ++ self.send(b'set timeout cli %d' % HAPROXY_CLI_TIMEOUT) + self.wait() + except SocketError: + raise SocketError('error while initializing interactive mode') + + def close(self): + try: +- self.send('quit') ++ self.send(b'quit') + except: + pass + try: +@@ -432,7 +432,7 @@ class Socket: + pass + + def send(self, cmdline): +- self._socket.sendall('%s\n' % cmdline) ++ self._socket.sendall(b'%s\n' % cmdline) + + def wait(self): + # Wait for the prompt and discard data. +@@ -495,7 +495,7 @@ class SocketData: + raise ValueError('invalid proxy filter: %s' % filter) + + # Convert proxy filters into more efficient stat filters +- self.socket.send('show stat') ++ self.socket.send(b'show stat') + pxstat, pxcount, svcount = parse_stat(self.socket.recv()) + + proxy_iid_map = {} # {pxname: iid, ...} +@@ -514,11 +514,11 @@ class SocketData: + raise RuntimeError('proxy not found: %s' % pxname) + + # Register filters +- for iid in proxy_iid_map.itervalues(): ++ for iid in proxy_iid_map.values(): + self._filters.add((iid, -1, -1)) + + def update_info(self): +- self.socket.send('show info') ++ self.socket.send(b'show info') + iterable = self.socket.recv() + self.info = parse_info(iterable) + +@@ -535,7 +535,7 @@ class SocketData: + + if self._filters: + for filter in self._filters: +- self.socket.send('show stat %d %d %d' % filter) ++ self.socket.send(b'show stat %d %d %d' % filter) + filter_stat, filter_pxcount, filter_svcount = \ + parse_stat(self.socket.recv()) + +@@ -546,7 +546,7 @@ class SocketData: + self.svcount += filter_svcount + self.stat.update(filter_stat) + else: +- self.socket.send('show stat') ++ self.socket.send(b'show stat') + self.stat, self.pxcount, self.svcount = \ + parse_stat(self.socket.recv()) + +@@ -716,7 +716,7 @@ class ScreenCLI: + self.ibuf = list(self.ihist[-1]) + self.mvend() + +- def next(self): ++ def __next__(self): + if len(self.ihist) == 0: + return + self.ihist.rotate(-1) +@@ -854,7 +854,7 @@ class ScreenCLI: + def execute_cmdline(self, cmdline): + self.obuf.append('* %s' % time.ctime()) + self.obuf.append('> %s' % cmdline) +- self.screen.data.socket.send(cmdline) ++ self.screen.data.socket.send(cmdline.encode()) + self.obuf.extend(self.screen.data.socket.recv()) + self.update_screenlines() + +@@ -1087,7 +1087,7 @@ class Screen: + self.data.update_info() + try: + self.data.update_stat() +- except RuntimeWarning, x: ++ except RuntimeWarning as x: + self.exceptions.append(x) + + def update_bars(self): +@@ -1438,19 +1438,19 @@ class StatusBar: + # ------------------------------------------------------------------------- # + + def human_seconds(numeric): +- for minval, prefix in sorted(PREFIX_TIME.items(), reverse=True): ++ for minval, prefix in sorted(list(PREFIX_TIME.items()), reverse=True): + if (numeric/minval): + return '%d%s' % (numeric/minval, prefix) + return '%ds' % numeric + + def human_metric(numeric): +- for minval, prefix in sorted(PREFIX_METRIC.items(), reverse=True): ++ for minval, prefix in sorted(list(PREFIX_METRIC.items()), reverse=True): + if (numeric/minval): + return '%d%s' % (numeric/minval, prefix) + return str(numeric) + + def human_binary(numeric): +- for minval, prefix in sorted(PREFIX_BINARY.items(), reverse=True): ++ for minval, prefix in sorted(list(PREFIX_BINARY.items()), reverse=True): + if (numeric/minval): + return '%.2f%s' % (float(numeric)/float(minval), prefix) + return '%dB' % numeric +@@ -1683,20 +1683,20 @@ def parse_info(iterable): + line = line.strip() + if not line: + continue +- for key, regexp in HAPROXY_INFO_RE.iteritems(): ++ for key, regexp in HAPROXY_INFO_RE.items(): + match = regexp.match(line) + if match: + info[key] = match.group('value') + break + +- for key in HAPROXY_INFO_RE.iterkeys(): ++ for key in HAPROXY_INFO_RE.keys(): + if not key in info: + raise RuntimeError('missing "%s" in info data' % key) + + return info + + def get_idx(field): +- return filter(lambda x: x[1][1] == field, HAPROXY_STAT_CSV)[0][0] ++ return [x for x in HAPROXY_STAT_CSV if x[1][1] == field][0][0] + + def get_width(width, xmax, ncols, idx): + # distribute excess space evenly from left to right +@@ -1732,7 +1732,7 @@ def get_head(mode): + def get_screenlines(stat): + screenlines = [] + +- for iid, svstats in stat.iteritems(): ++ for iid, svstats in stat.items(): + lines = [] + + try: +@@ -1774,11 +1774,11 @@ def get_screenline(mode, stat): + value = stat[column.name] + + for filter in column.filters['always']: +- value = filter(value) ++ value = list(filter(value)) + + if len(str(value)) > column.width: + for filter in column.filters['ondemand']: +- value = filter(value) ++ value = list(filter(value)) + + value = str(value) + value = trim(value, column.width) +@@ -2099,7 +2099,7 @@ def mainloop(screen, interval): + elif c == curses.KEY_UP: + screen.cli.prev() + elif c == curses.KEY_DOWN: +- screen.cli.next() ++ next(screen.cli) + + # output history + elif c == curses.KEY_PPAGE: +@@ -2202,21 +2202,21 @@ if __name__ == '__main__': + break + except KeyboardInterrupt: + break +- except CursesError, e: ++ except CursesError as e: + screen.reset() + log('curses error: %s, restarting...' % e) + time.sleep(1) + screen.recover() + +- except ValueError, e: ++ except ValueError as e: + screen.reset() + log('value error: %s' % e) + sys.exit(1) +- except RuntimeError, e: ++ except RuntimeError as e: + screen.reset() + log('runtime error: %s' % e) + sys.exit(1) +- except SocketError, e: ++ except SocketError as e: + screen.reset() + log('socket error: %s' % e) + sys.exit(2)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912090833.xB98Xd22042996>