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 1Qgkmh-0002Ho-Nb for garchives@archives.gentoo.org; Tue, 12 Jul 2011 21:46:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1D9E21C287; Tue, 12 Jul 2011 21:45:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6D35F21C285 for ; Tue, 12 Jul 2011 21:45:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6E9A2AC238 for ; Tue, 12 Jul 2011 21:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4CDBC8003E for ; Tue, 12 Jul 2011 21:45:28 +0000 (UTC) From: "Paul Varner" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Paul Varner" Message-ID: <1bc82cc11fde5b0db852c1bd3954cfb70db61d25.fuzzyray@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/revdep_rebuild/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/revdep_rebuild/analyse.py pym/gentoolkit/revdep_rebuild/assign.py pym/gentoolkit/revdep_rebuild/cache.py pym/gentoolkit/revdep_rebuild/rebuild.py pym/gentoolkit/revdep_rebuild/stuff.py X-VCS-Directories: pym/gentoolkit/revdep_rebuild/ X-VCS-Committer: fuzzyray X-VCS-Committer-Name: Paul Varner X-VCS-Revision: 1bc82cc11fde5b0db852c1bd3954cfb70db61d25 Date: Tue, 12 Jul 2011 21:45:28 +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: X-Archives-Hash: 24d0a466a4d580ad26745430f195bd8a commit: 1bc82cc11fde5b0db852c1bd3954cfb70db61d25 Author: Paul Varner gentoo org> AuthorDate: Tue Jul 12 20:31:33 2011 +0000 Commit: Paul Varner gentoo org> CommitDate: Tue Jul 12 21:29:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoolkit.gi= t;a=3Dcommit;h=3D1bc82cc1 Fix python 3 syntax errors with new revdep-rebuild. Change VERSION to reference __version__. --- pym/gentoolkit/revdep_rebuild/analyse.py | 2 +- pym/gentoolkit/revdep_rebuild/assign.py | 2 +- pym/gentoolkit/revdep_rebuild/cache.py | 4 ++-- pym/gentoolkit/revdep_rebuild/rebuild.py | 21 +++++++++++---------- pym/gentoolkit/revdep_rebuild/stuff.py | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/re= vdep_rebuild/analyse.py index d94365e..3061328 100644 --- a/pym/gentoolkit/revdep_rebuild/analyse.py +++ b/pym/gentoolkit/revdep_rebuild/analyse.py @@ -218,4 +218,4 @@ def analyse(settings, logger, libraries=3DNone, la_li= braries=3DNone, =20 =20 if __name__ =3D=3D '__main__': - print "This script shouldn't be called directly" + print("This script shouldn't be called directly") diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/rev= dep_rebuild/assign.py index bb9ec1f..f7f0304 100644 --- a/pym/gentoolkit/revdep_rebuild/assign.py +++ b/pym/gentoolkit/revdep_rebuild/assign.py @@ -89,4 +89,4 @@ def get_slotted_cps(cpvs, logger): =20 =20 if __name__ =3D=3D '__main__': - print 'Nothing to call here' + print('Nothing to call here') diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revd= ep_rebuild/cache.py index 8b1a8ed..6d21016 100644 --- a/pym/gentoolkit/revdep_rebuild/cache.py +++ b/pym/gentoolkit/revdep_rebuild/cache.py @@ -84,7 +84,7 @@ def check_temp_files(temp_path=3DDEFAULTS['DEFAULT_TMP_= DIR'], max_delay=3D3600): =20 =20 if __name__ =3D=3D '__main__': - print 'Preparing cache ... ' + print('Preparing cache ... ') =20 from collect import * import logging @@ -104,4 +104,4 @@ if __name__ =3D=3D '__main__': 'libraries_links':libraries_links, 'binaries':binaries} ) =20 - print 'Done.' + print('Done.') diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/re= vdep_rebuild/rebuild.py index 834170e..778c528 100644 --- a/pym/gentoolkit/revdep_rebuild/rebuild.py +++ b/pym/gentoolkit/revdep_rebuild/rebuild.py @@ -29,10 +29,11 @@ from stuff import exithandler, get_masking_status from cache import check_temp_files, read_cache from assign import get_slotted_cps from settings import DEFAULTS +from gentoolkit.revdep_rebuild import __version__ =20 =20 APP_NAME =3D sys.argv[0] -VERSION =3D '0.1-r7' +VERSION =3D __version__ =20 __productname__ =3D "revdep-ng" =20 @@ -40,16 +41,16 @@ __productname__ =3D "revdep-ng" # functions =20 def print_usage(): - print APP_NAME + ': (' + VERSION +')' + print( APP_NAME + ': (' + VERSION +')') print - print 'This is free software; see the source for copying conditions.' + print('This is free software; see the source for copying conditions.') print - print 'Usage: ' + APP_NAME + ' [OPTIONS] [--] [EMERGE_OPTIONS]' + print('Usage: ' + APP_NAME + ' [OPTIONS] [--] [EMERGE_OPTIONS]') print - print 'Broken reverse dependency rebuilder, python implementation.' + print('Broken reverse dependency rebuilder, python implementation.') print - print 'Available options:' - print ''' + print('Available options:') + print(''' -C, --nocolor Turn off colored output -d, --debug Print debug informations -e, --exact Emerge based on exact package version @@ -66,9 +67,9 @@ def print_usage(): (also passed to emerge command) -q, --quiet Be less verbose (also passed to emerge command) -v, --verbose Be more verbose (also passed to emerge command) -''' - print 'Calls emerge, options after -- are ignored by ' + APP_NAME - print 'and passed directly to emerge.' +''') + print( 'Calls emerge, options after -- are ignored by ' + APP_NAME) + print('and passed directly to emerge.') =20 =20 def init_logger(settings): diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revd= ep_rebuild/stuff.py index 7b287b1..1ab21f2 100644 --- a/pym/gentoolkit/revdep_rebuild/stuff.py +++ b/pym/gentoolkit/revdep_rebuild/stuff.py @@ -52,4 +52,4 @@ def _match_str_in_list(lst, stri): =20 =20 if __name__ =3D=3D '__main__': - print "There is nothing to run here." + print("There is nothing to run here.")