summaryrefslogtreecommitdiff
path: root/pym
diff options
context:
space:
mode:
authorPaul Varner <fuzzyray@gentoo.org>2011-07-12 15:31:33 -0500
committerPaul Varner <fuzzyray@gentoo.org>2011-07-12 16:29:01 -0500
commit1bc82cc11fde5b0db852c1bd3954cfb70db61d25 (patch)
treed3cf0d868e9c75a5fb73de79910769d025ec89ed /pym
parent202d90d426f3808893168be4e7b65e36e44002da (diff)
downloadgentoolkit-1bc82cc11fde5b0db852c1bd3954cfb70db61d25.tar.gz
Fix python 3 syntax errors with new revdep-rebuild. Change VERSION to
reference __version__.
Diffstat (limited to 'pym')
-rw-r--r--pym/gentoolkit/revdep_rebuild/analyse.py2
-rw-r--r--pym/gentoolkit/revdep_rebuild/assign.py2
-rw-r--r--pym/gentoolkit/revdep_rebuild/cache.py4
-rw-r--r--pym/gentoolkit/revdep_rebuild/rebuild.py21
-rw-r--r--pym/gentoolkit/revdep_rebuild/stuff.py2
5 files changed, 16 insertions, 15 deletions
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_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=None, la_libraries=None,
if __name__ == '__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/revdep_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):
if __name__ == '__main__':
- print 'Nothing to call here'
+ print('Nothing to call here')
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_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=DEFAULTS['DEFAULT_TMP_DIR'], max_delay=3600):
if __name__ == '__main__':
- print 'Preparing cache ... '
+ print('Preparing cache ... ')
from collect import *
import logging
@@ -104,4 +104,4 @@ if __name__ == '__main__':
'libraries_links':libraries_links, 'binaries':binaries}
)
- print 'Done.'
+ print('Done.')
diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_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__
APP_NAME = sys.argv[0]
-VERSION = '0.1-r7'
+VERSION = __version__
__productname__ = "revdep-ng"
@@ -40,16 +41,16 @@ __productname__ = "revdep-ng"
# functions
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.')
def init_logger(settings):
diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_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):
if __name__ == '__main__':
- print "There is nothing to run here."
+ print("There is nothing to run here.")