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 52C951381FA for ; Mon, 2 Jun 2014 15:01:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 889A6E0A84; Mon, 2 Jun 2014 15:01:08 +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 25343E0A7D for ; Mon, 2 Jun 2014 15:01:08 +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 05D4933F883 for ; Mon, 2 Jun 2014 15:01:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7E619181A9 for ; Mon, 2 Jun 2014 15:01:05 +0000 (UTC) From: "Tom Wijsman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tom Wijsman" Message-ID: <1401721003.23c506ae53bcfb747783b7436af5f768552b53bc.tomwij@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/argparser.py pym/repoman/metadata.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: tomwij X-VCS-Committer-Name: Tom Wijsman X-VCS-Revision: 23c506ae53bcfb747783b7436af5f768552b53bc X-VCS-Branch: repoman Date: Mon, 2 Jun 2014 15:01:05 +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: 126af396-acc9-44d9-a204-57cd912cb227 X-Archives-Hash: cab38e0aaa0f8d90f62242502dbdb94a commit: 23c506ae53bcfb747783b7436af5f768552b53bc Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 14:56:43 2014 +0000 Commit: Tom Wijsman gentoo org> CommitDate: Mon Jun 2 14:56:43 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=23c506ae repoman/{argparser,metadata}.py: Fix up missing imports and definition --- pym/repoman/argparser.py | 1 + pym/repoman/metadata.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py index 5005798..19ec6e9 100644 --- a/pym/repoman/argparser.py +++ b/pym/repoman/argparser.py @@ -4,6 +4,7 @@ """This module contains functions used in Repoman to parse CLI arguments.""" +import logging import portage from portage import util from portage.util._argparse import ArgumentParser diff --git a/pym/repoman/metadata.py b/pym/repoman/metadata.py index f281523..b4950ad 100644 --- a/pym/repoman/metadata.py +++ b/pym/repoman/metadata.py @@ -1,6 +1,7 @@ import errno import logging +import sys import tempfile import time @@ -15,6 +16,8 @@ from portage import exception from portage import os from portage.output import green +if sys.hexversion >= 0x3000000: + basestring = str metadata_xml_encoding = 'UTF-8' metadata_xml_declaration = '' \