svn commit: r340825 - in head/www/uwsgitop: . files

[Dmitry Sivachenko]

Author: demon
Date: Thu Jan 23 12:32:36 2014
New Revision: 340825
URL: http://svnweb.freebsd.org/changeset/ports/340825
QAT: https://qat.redports.org/buildarchive/r340825/

Log:
  Fix for python-3.X.
  
  Obtained from:	upstream

Added:
  head/www/uwsgitop/files/
  head/www/uwsgitop/files/patch-uwsgitop   (contents, props changed)
Modified:
  head/www/uwsgitop/Makefile

Modified: head/www/uwsgitop/Makefile
==============================================================================
--- head/www/uwsgitop/Makefile	Thu Jan 23 11:57:04 2014	(r340824)
+++ head/www/uwsgitop/Makefile	Thu Jan 23 12:32:36 2014	(r340825)
@@ -3,6 +3,7 @@
 
 PORTNAME=	uwsgitop
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_CHEESESHOP}
 MASTER_SITE_SUBDIR=source/u/${PORTNAME}

Added: head/www/uwsgitop/files/patch-uwsgitop
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/uwsgitop/files/patch-uwsgitop	Thu Jan 23 12:32:36 2014	(r340825)
@@ -0,0 +1,35 @@
+--- uwsgitop.bak
++++ uwsgitop
+@@ -82,12 +82,8 @@ except:
+     pass
+ screen.clear()
+ 
+-def reqcount(a, b):
+-    if a['requests'] > b['requests']:
+-        return -1
+-    if a['requests'] < b['requests']:
+-        return 1
+-    return 0
++def reqcount(item):
++    return item['requests']
+ 
+ def calc_percent(tot, req):
+     if tot == 0:
+@@ -112,7 +108,7 @@ while True:
+             data = s.recv(4096)
+             if len(data) < 1:
+                 break
+-            js += data
++            js += data.decode('utf8')
+     except:
+         raise Exception("unable to get uWSGI statistics")
+ 
+@@ -175,7 +171,7 @@ while True:
+         screen.addstr(2, 0, " WID\t%\tPID\tREQ\tRPS\tEXC\tSIG\tSTATUS\tAVG\tRSS\tVSZ\tTX\tRunT\t", curses.A_REVERSE)
+         pos = 3
+ 
+-        dd['workers'].sort(reqcount)
++        dd['workers'].sort(key=reqcount)
+         for worker in dd['workers']:
+             sigs = 0
+             wtx = human_size(worker['tx'])