From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5F7431388C0 for ; Wed, 24 Feb 2016 00:25:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97314E07D9; Wed, 24 Feb 2016 00:25:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 247B3E07D9 for ; Wed, 24 Feb 2016 00:25:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2FB334069A for ; Wed, 24 Feb 2016 00:25:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95CCB15FB for ; Wed, 24 Feb 2016 00:25:26 +0000 (UTC) From: "Jason Donenfeld" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Donenfeld" Message-ID: <1456273515.fda9977267fc1afe379130af17048354a8fcd8a4.zx2c4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/speedtest-cli/files/, net-analyzer/speedtest-cli/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild X-VCS-Directories: net-analyzer/speedtest-cli/files/ net-analyzer/speedtest-cli/ X-VCS-Committer: zx2c4 X-VCS-Committer-Name: Jason Donenfeld X-VCS-Revision: fda9977267fc1afe379130af17048354a8fcd8a4 X-VCS-Branch: master Date: Wed, 24 Feb 2016 00:25:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0e42b6a9-13fc-409d-a9ef-ffd43262412a X-Archives-Hash: 57c0e7f9c0527e0280e8a82830016325 commit: fda9977267fc1afe379130af17048354a8fcd8a4 Author: Louis Sautier gmail com> AuthorDate: Tue Feb 16 19:08:52 2016 +0000 Commit: Jason Donenfeld gentoo org> CommitDate: Wed Feb 24 00:25:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda99772 net-analyzer/speedtest-cli: Fix output with Python 3 Upstream will not fix this until the next release https://github.com/sivel/speedtest-cli/pull/233 Package-Manager: portage-2.2.27 .../speedtest-cli-0.3.4-fix-unicode-py3.patch | 36 ++++++++++++++++++++++ ...-0.3.4.ebuild => speedtest-cli-0.3.4-r1.ebuild} | 2 ++ 2 files changed, 38 insertions(+) diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch new file mode 100644 index 0000000..2bd809f --- /dev/null +++ b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch @@ -0,0 +1,36 @@ +diff --git a/speedtest_cli.py b/speedtest_cli.py +index d93d5c3..930e42b 100755 +--- a/speedtest_cli.py ++++ b/speedtest_cli.py +@@ -108,6 +108,8 @@ except ImportError: + def write(data): + if not isinstance(data, basestring): + data = str(data) ++ if isinstance(data, unicode): ++ data = data.encode('utf-8', 'ignore') + fp.write(data) + + want_unicode = False +@@ -635,7 +637,7 @@ def speedtest(): + line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) ' + '[%(d)0.2f km]' % server) + serverList.append(line) +- print_('\n'.join(serverList).encode('utf-8', 'ignore')) ++ print_('\n'.join(serverList)) + sys.exit(0) + else: + servers = closestServers(config['client']) +@@ -703,8 +705,8 @@ def speedtest(): + best = getBestServer(servers) + + if not args.simple: +- print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' +- '%(latency)s ms' % best).encode('utf-8', 'ignore')) ++ print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: ' ++ '%(latency)s ms' % best) + else: + print_('Ping: %(latency)s ms' % best) + +-- +2.7.1 + diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild similarity index 91% rename from net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild rename to net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild index a27f02d..444654d 100644 --- a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild +++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild @@ -21,6 +21,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" DOCS=( CONTRIBUTING.md README.rst ) +PATCHES=( "${FILESDIR}/${PN}-0.3.4-fix-unicode-py3.patch" ) + python_install_all() { doman ${PN}.1 distutils-r1_python_install_all