From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SjY6m-0002AC-KH for garchives@archives.gentoo.org; Tue, 26 Jun 2012 15:55:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A053E09D4; Tue, 26 Jun 2012 15:55:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3DA52E09D4 for ; Tue, 26 Jun 2012 15:55:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 083A21B4598 for ; Tue, 26 Jun 2012 15:55:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C673FE5432 for ; Tue, 26 Jun 2012 15:55:05 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1340726033.b866245c1503fe74352cbbae85ec5ab4108e5f7e.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/remote/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/remote/repoloader.py X-VCS-Directories: roverlay/remote/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: b866245c1503fe74352cbbae85ec5ab4108e5f7e X-VCS-Branch: master Date: Tue, 26 Jun 2012 15:55: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e069734c-de84-4a70-9a0f-c3ee20dfb726 X-Archives-Hash: a06abc980c648be04f500f3b136af9fb commit: b866245c1503fe74352cbbae85ec5ab4108e5f7e Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Tue Jun 26 15:53:53 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Tue Jun 26 15:53:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Db866245c use parser.get without fallback keyword * using get (configparser) without the fallback keyword if python version is < 3.2 modified: roverlay/remote/repoloader.py --- roverlay/remote/repoloader.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/roverlay/remote/repoloader.py b/roverlay/remote/repoloader.p= y index 94dd5b7..cd7c9fc 100644 --- a/roverlay/remote/repoloader.py +++ b/roverlay/remote/repoloader.py @@ -1,4 +1,4 @@ - +import sys import logging =20 try: @@ -33,7 +33,12 @@ def read_repofile ( repo_file, lenient=3DFalse ): =20 for name in parser.sections(): =20 - get =3D lambda a, b=3DNone : parser.get ( name, a, raw=3DTrue, fallbac= k=3Db ) + if sys.version_info < ( 3, 2 ): + # FIXME replace this and use more accurate version condition + get =3D lambda a, b=3DNone: parser.get ( name, a, raw=3DTrue ) \ + if parser.has_option ( name, a ) else b + else: + get =3D lambda a, b=3DNone : parser.get ( name, a, raw=3DTrue, fallba= ck=3Db ) =20 repo_type =3D get ( 'type', 'rsync' ).lower() =20