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 7791F13877A for ; Mon, 16 Jun 2014 03:37:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4DBEE0BC0; Mon, 16 Jun 2014 03:37:35 +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 6151AE0B9C for ; Mon, 16 Jun 2014 03:37:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38A8B33FFF4 for ; Mon, 16 Jun 2014 03:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3421918874 for ; Mon, 16 Jun 2014 03:37:30 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402792601.d161e4fb9e41cdc841adb40b86ab6cbb5b01a0a2.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:gsoc2014 commit in: layman/tests/ X-VCS-Repository: proj/layman X-VCS-Files: layman/tests/external.py X-VCS-Directories: layman/tests/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d161e4fb9e41cdc841adb40b86ab6cbb5b01a0a2 X-VCS-Branch: gsoc2014 Date: Mon, 16 Jun 2014 03:37:30 +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: 1d02bae2-4cef-49ae-9f6f-a22c29cc779f X-Archives-Hash: 823d69a64faea0ce68f955345084dead commit: d161e4fb9e41cdc841adb40b86ab6cbb5b01a0a2 Author: Devan Franchini gentoo org> AuthorDate: Thu Jun 12 21:39:26 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Jun 15 00:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=d161e4fb external.py: Adds py3 compatibility to tests Adds py3 urllib imports, print function updates, and implicit utf-8 decoding of test strings. --- layman/tests/external.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/layman/tests/external.py b/layman/tests/external.py index 82825e2..5882270 100755 --- a/layman/tests/external.py +++ b/layman/tests/external.py @@ -15,11 +15,15 @@ # '''Runs external (non-doctest) test cases.''' -import unittest import os -import tempfile import shutil -import urllib +import tempfile +import unittest +#Py3 +try: + import urllib.request as urllib +except ImportError: + import urllib from layman.dbbase import DbBase from layman.output import Message from layman.config import BareConfig @@ -35,8 +39,8 @@ class Unicode(unittest.TestCase): o = DbBase(config, [filename]) for verbose in (True, False): for t in o.list(verbose=verbose): - print t[0] - print + print(t[0].decode('utf-8')) + print() def test_184449(self): self._overlays_bug(184449) 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 B9E5F13877A for ; Mon, 16 Jun 2014 03:40:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BCD9E0B8F; Mon, 16 Jun 2014 03:40:24 +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 EA300E0B77 for ; Mon, 16 Jun 2014 03:40:22 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2CC733FDBE for ; Mon, 16 Jun 2014 03:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1717718874 for ; Mon, 16 Jun 2014 03:40:20 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402792601.d161e4fb9e41cdc841adb40b86ab6cbb5b01a0a2.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/tests/ X-VCS-Repository: proj/layman X-VCS-Files: layman/tests/external.py X-VCS-Directories: layman/tests/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: d161e4fb9e41cdc841adb40b86ab6cbb5b01a0a2 X-VCS-Branch: master Date: Mon, 16 Jun 2014 03:40:20 +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: e4aba5e2-7a85-4910-aabb-9d125dff7a37 X-Archives-Hash: 8f0867114c8c852e0b000198a8ddd2fb Message-ID: <20140616034020._1C7MOL4JI0lAViynjAEaXBl0bM5IBcANPoyxI0aIDg@z> commit: d161e4fb9e41cdc841adb40b86ab6cbb5b01a0a2 Author: Devan Franchini gentoo org> AuthorDate: Thu Jun 12 21:39:26 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Jun 15 00:36:41 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=d161e4fb external.py: Adds py3 compatibility to tests Adds py3 urllib imports, print function updates, and implicit utf-8 decoding of test strings. --- layman/tests/external.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/layman/tests/external.py b/layman/tests/external.py index 82825e2..5882270 100755 --- a/layman/tests/external.py +++ b/layman/tests/external.py @@ -15,11 +15,15 @@ # '''Runs external (non-doctest) test cases.''' -import unittest import os -import tempfile import shutil -import urllib +import tempfile +import unittest +#Py3 +try: + import urllib.request as urllib +except ImportError: + import urllib from layman.dbbase import DbBase from layman.output import Message from layman.config import BareConfig @@ -35,8 +39,8 @@ class Unicode(unittest.TestCase): o = DbBase(config, [filename]) for verbose in (True, False): for t in o.list(verbose=verbose): - print t[0] - print + print(t[0].decode('utf-8')) + print() def test_184449(self): self._overlays_bug(184449)