diff -Nru software-center-5.1.12/data/delete_review_gtk3.py software-center-5.1.13/data/delete_review_gtk3.py --- software-center-5.1.12/data/delete_review_gtk3.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/delete_review_gtk3.py 2012-03-16 08:30:18.000000000 +0000 @@ -69,10 +69,10 @@ parser = OptionParser() parser.add_option("", "--datadir", default=default_datadir) - logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") - logfile_handler = logging.handlers.RotatingFileHandler(logfile_path, - maxBytes=100*1000, - backupCount=5) + logfile_path = os.path.join( + SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") + logfile_handler = logging.handlers.RotatingFileHandler( + logfile_path, maxBytes = 100 * 1000, backupCount = 5) logfile_handler.setLevel(logging.INFO) logging.getLogger().addHandler(logfile_handler) logging.getLogger().addHandler(logging.StreamHandler()) @@ -103,9 +103,9 @@ if not (options.pkgname and options.version): parser.error(_("Missing arguments")) - + if options.debug: - logging.basicConfig(level=logging.DEBUG) + logging.basicConfig(level=logging.DEBUG) # personality logging.debug("submit_review mode") @@ -113,14 +113,13 @@ # initialize and run theapp = Application(options.appname, options.pkgname) review_app = SubmitReviewsApp(datadir=options.datadir, - app=theapp, + app=theapp, parent_xid=options.parent_xid, iconname=options.iconname, origin=options.origin, version=options.version) review_app.run() - # run "report" personality if "report_review" in sys.argv[0]: # check options @@ -134,7 +133,7 @@ if not (options.review_id): parser.error(_("Missing review-id arguments")) - + if options.debug: logging.basicConfig(level=logging.DEBUG) Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/emblems/sc-emblem-favorite-not.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/emblems/sc-emblem-favorite-not.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/emblems/sc-emblem-favorite.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/emblems/sc-emblem-favorite.png differ diff -Nru software-center-5.1.12/data/expunge-cache.py software-center-5.1.13/data/expunge-cache.py --- software-center-5.1.12/data/expunge-cache.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/expunge-cache.py 2012-03-16 08:30:18.000000000 +0000 @@ -10,11 +10,13 @@ import time import sys + class ExpungeCache(object): + def __init__(self, dirs, args): self.dirs = dirs # days to keep data in the cache (0 == disabled) - self.keep_time = 60*60*24* args.by_days + self.keep_time = 60 * 60 * 24 * args.by_days self.keep_only_http200 = args.by_unsuccessful_http_states self.dry_run = args.dry_run Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons/24x24/status/softwarecenter-progress.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons/24x24/status/softwarecenter-progress.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons/32x32/animations/softwarecenter-loading.gif and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons/32x32/animations/softwarecenter-loading.gif differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons/32x32/animations/softwarecenter-loading-installed.gif and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons/32x32/animations/softwarecenter-loading-installed.gif differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/128x128/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/128x128/apps/softwarecenter.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/16x16/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/16x16/apps/softwarecenter.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/22x22/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/22x22/apps/softwarecenter.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/24x24/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/24x24/apps/softwarecenter.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/32x32/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/32x32/apps/softwarecenter.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/48x48/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/48x48/apps/softwarecenter.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/icons_unbranded/64x64/apps/softwarecenter.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/icons_unbranded/64x64/apps/softwarecenter.png differ diff -Nru software-center-5.1.12/data/icons_unbranded/scalable/apps/category-show-all.svg software-center-5.1.13/data/icons_unbranded/scalable/apps/category-show-all.svg --- software-center-5.1.12/data/icons_unbranded/scalable/apps/category-show-all.svg 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/icons_unbranded/scalable/apps/category-show-all.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,1074 +0,0 @@ - - - - diff -Nru software-center-5.1.12/data/icons_unbranded/scalable/apps/softwarecenter.svg software-center-5.1.13/data/icons_unbranded/scalable/apps/softwarecenter.svg --- software-center-5.1.12/data/icons_unbranded/scalable/apps/softwarecenter.svg 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/icons_unbranded/scalable/apps/softwarecenter.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,1539 +0,0 @@ - - - - Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/images/arrows.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/images/arrows.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/images/clouds.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/images/clouds.png differ diff -Nru software-center-5.1.12/data/modify_review_gtk3.py software-center-5.1.13/data/modify_review_gtk3.py --- software-center-5.1.12/data/modify_review_gtk3.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/modify_review_gtk3.py 2012-03-16 08:30:18.000000000 +0000 @@ -69,10 +69,10 @@ parser = OptionParser() parser.add_option("", "--datadir", default=default_datadir) - logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") - logfile_handler = logging.handlers.RotatingFileHandler(logfile_path, - maxBytes=100*1000, - backupCount=5) + logfile_path = os.path.join( + SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") + logfile_handler = logging.handlers.RotatingFileHandler( + logfile_path, maxBytes = 100 * 1000, backupCount = 5) logfile_handler.setLevel(logging.INFO) logging.getLogger().addHandler(logfile_handler) logging.getLogger().addHandler(logging.StreamHandler()) @@ -103,9 +103,9 @@ if not (options.pkgname and options.version): parser.error(_("Missing arguments")) - + if options.debug: - logging.basicConfig(level=logging.DEBUG) + logging.basicConfig(level=logging.DEBUG) # personality logging.debug("submit_review mode") @@ -113,14 +113,13 @@ # initialize and run theapp = Application(options.appname, options.pkgname) review_app = SubmitReviewsApp(datadir=options.datadir, - app=theapp, + app=theapp, parent_xid=options.parent_xid, iconname=options.iconname, origin=options.origin, version=options.version) review_app.run() - # run "report" personality if "report_review" in sys.argv[0]: # check options @@ -134,7 +133,7 @@ if not (options.review_id): parser.error(_("Missing review-id arguments")) - + if options.debug: logging.basicConfig(level=logging.DEBUG) diff -Nru software-center-5.1.12/data/piston_generic_helper.py software-center-5.1.13/data/piston_generic_helper.py --- software-center-5.1.12/data/piston_generic_helper.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/piston_generic_helper.py 2012-03-16 08:30:18.000000000 +0000 @@ -56,14 +56,17 @@ from softwarecenter.backend.piston.ubuntusso_pristine import UbuntuSsoAPI from softwarecenter.backend.piston.rnrclient import RatingsAndReviewsAPI from softwarecenter.backend.piston.scaclient import SoftwareCenterAgentAPI -from softwarecenter.backend.piston.sreclient_pristine import SoftwareCenterRecommenderAPI +from softwarecenter.backend.piston.sreclient_pristine import ( + SoftwareCenterRecommenderAPI) # patch default_service_root to the one we use -from softwarecenter.enums import SSO_LOGIN_HOST -UbuntuSsoAPI.default_service_root = SSO_LOGIN_HOST+"/api/1.0" +from softwarecenter.enums import UBUNTU_SSO_SERVICE +# *Don't* append /api/1.0, as it's already included in UBUNTU_SSO_SERVICE +UbuntuSsoAPI.default_service_root = UBUNTU_SSO_SERVICE from softwarecenter.enums import RECOMMENDER_HOST -SoftwareCenterRecommenderAPI.default_service_root = RECOMMENDER_HOST+"/api/1.0" +SoftwareCenterRecommenderAPI.default_service_root = \ + RECOMMENDER_HOST + "/api/1.0" RatingsAndReviewsAPI # pyflakes @@ -73,6 +76,7 @@ from gettext import gettext as _ + # helper that is only used to verify that the token is ok # and trigger cleanup if not class SSOLoginHelper(object): @@ -90,10 +94,9 @@ def verify_token_sync(self, token): LOG.debug("verify_token") - auth = piston_mini_client.auth.OAuthAuthorizer(token["token"], - token["token_secret"], - token["consumer_key"], - token["consumer_secret"]) + auth = piston_mini_client.auth.OAuthAuthorizer( + token["token"], token["token_secret"], + token["consumer_key"], token["consumer_secret"]) api = UbuntuSsoAPI(auth=auth) try: res = api.whoami() @@ -128,7 +131,6 @@ return token - LOG = logging.getLogger(__name__) if __name__ == "__main__": @@ -179,10 +181,9 @@ sys.stderr.write("ERROR: can not obtain a oauth token\n") sys.exit(1) - auth = piston_mini_client.auth.OAuthAuthorizer(token["token"], - token["token_secret"], - token["consumer_key"], - token["consumer_secret"]) + auth = piston_mini_client.auth.OAuthAuthorizer( + token["token"], token["token_secret"], + token["consumer_key"], token["consumer_secret"]) api = klass(cachedir=cachedir, auth=auth) else: api = klass(cachedir=cachedir) diff -Nru software-center-5.1.12/data/report_review_gtk3.py software-center-5.1.13/data/report_review_gtk3.py --- software-center-5.1.12/data/report_review_gtk3.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/report_review_gtk3.py 2012-03-16 08:30:18.000000000 +0000 @@ -69,10 +69,10 @@ parser = OptionParser() parser.add_option("", "--datadir", default=default_datadir) - logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") - logfile_handler = logging.handlers.RotatingFileHandler(logfile_path, - maxBytes=100*1000, - backupCount=5) + logfile_path = os.path.join( + SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") + logfile_handler = logging.handlers.RotatingFileHandler( + logfile_path, maxBytes = 100 * 1000, backupCount = 5) logfile_handler.setLevel(logging.INFO) logging.getLogger().addHandler(logfile_handler) logging.getLogger().addHandler(logging.StreamHandler()) @@ -103,9 +103,9 @@ if not (options.pkgname and options.version): parser.error(_("Missing arguments")) - + if options.debug: - logging.basicConfig(level=logging.DEBUG) + logging.basicConfig(level=logging.DEBUG) # personality logging.debug("submit_review mode") @@ -113,14 +113,13 @@ # initialize and run theapp = Application(options.appname, options.pkgname) review_app = SubmitReviewsApp(datadir=options.datadir, - app=theapp, + app=theapp, parent_xid=options.parent_xid, iconname=options.iconname, origin=options.origin, version=options.version) review_app.run() - # run "report" personality if "report_review" in sys.argv[0]: # check options @@ -134,7 +133,7 @@ if not (options.review_id): parser.error(_("Missing review-id arguments")) - + if options.debug: logging.basicConfig(level=logging.DEBUG) diff -Nru software-center-5.1.12/data/submit_review_gtk3.py software-center-5.1.13/data/submit_review_gtk3.py --- software-center-5.1.12/data/submit_review_gtk3.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/submit_review_gtk3.py 2012-03-16 08:30:18.000000000 +0000 @@ -69,10 +69,10 @@ parser = OptionParser() parser.add_option("", "--datadir", default=default_datadir) - logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") - logfile_handler = logging.handlers.RotatingFileHandler(logfile_path, - maxBytes=100*1000, - backupCount=5) + logfile_path = os.path.join( + SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") + logfile_handler = logging.handlers.RotatingFileHandler( + logfile_path, maxBytes = 100 * 1000, backupCount = 5) logfile_handler.setLevel(logging.INFO) logging.getLogger().addHandler(logfile_handler) logging.getLogger().addHandler(logging.StreamHandler()) @@ -103,9 +103,9 @@ if not (options.pkgname and options.version): parser.error(_("Missing arguments")) - + if options.debug: - logging.basicConfig(level=logging.DEBUG) + logging.basicConfig(level=logging.DEBUG) # personality logging.debug("submit_review mode") @@ -113,14 +113,13 @@ # initialize and run theapp = Application(options.appname, options.pkgname) review_app = SubmitReviewsApp(datadir=options.datadir, - app=theapp, + app=theapp, parent_xid=options.parent_xid, iconname=options.iconname, origin=options.origin, version=options.version) review_app.run() - # run "report" personality if "report_review" in sys.argv[0]: # check options @@ -134,7 +133,7 @@ if not (options.review_id): parser.error(_("Missing review-id arguments")) - + if options.debug: logging.basicConfig(level=logging.DEBUG) diff -Nru software-center-5.1.12/data/submit_usefulness_gtk3.py software-center-5.1.13/data/submit_usefulness_gtk3.py --- software-center-5.1.12/data/submit_usefulness_gtk3.py 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/submit_usefulness_gtk3.py 2012-03-16 08:30:18.000000000 +0000 @@ -69,10 +69,10 @@ parser = OptionParser() parser.add_option("", "--datadir", default=default_datadir) - logfile_path = os.path.join(SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") - logfile_handler = logging.handlers.RotatingFileHandler(logfile_path, - maxBytes=100*1000, - backupCount=5) + logfile_path = os.path.join( + SOFTWARE_CENTER_CACHE_DIR, "reviews-helper.log") + logfile_handler = logging.handlers.RotatingFileHandler( + logfile_path, maxBytes = 100 * 1000, backupCount = 5) logfile_handler.setLevel(logging.INFO) logging.getLogger().addHandler(logfile_handler) logging.getLogger().addHandler(logging.StreamHandler()) @@ -103,9 +103,9 @@ if not (options.pkgname and options.version): parser.error(_("Missing arguments")) - + if options.debug: - logging.basicConfig(level=logging.DEBUG) + logging.basicConfig(level=logging.DEBUG) # personality logging.debug("submit_review mode") @@ -113,14 +113,13 @@ # initialize and run theapp = Application(options.appname, options.pkgname) review_app = SubmitReviewsApp(datadir=options.datadir, - app=theapp, + app=theapp, parent_xid=options.parent_xid, iconname=options.iconname, origin=options.origin, version=options.version) review_app.run() - # run "report" personality if "report_review" in sys.argv[0]: # check options @@ -134,7 +133,7 @@ if not (options.review_id): parser.error(_("Missing review-id arguments")) - + if options.debug: logging.basicConfig(level=logging.DEBUG) diff -Nru software-center-5.1.12/data/templates/WKTestWidget.html software-center-5.1.13/data/templates/WKTestWidget.html --- software-center-5.1.12/data/templates/WKTestWidget.html 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/templates/WKTestWidget.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ - - -
-- Some text with a substitute value: '${key}'. -
- - - - - - - - - Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/ui/gtk3/art/corner-label.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/ui/gtk3/art/corner-label.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/ui/gtk3/art/globalpane-bg.png and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/ui/gtk3/art/globalpane-bg.png differ Binary files /tmp/pdaBoZfIGj/software-center-5.1.12/data/ui/gtk3/art/globalpane-bg.xcf and /tmp/Ix9HaF1nrz/software-center-5.1.13/data/ui/gtk3/art/globalpane-bg.xcf differ diff -Nru software-center-5.1.12/data/ui/gtk3/dialogs.ui software-center-5.1.13/data/ui/gtk3/dialogs.ui --- software-center-5.1.12/data/ui/gtk3/dialogs.ui 2012-03-07 17:25:50.000000000 +0000 +++ software-center-5.1.13/data/ui/gtk3/dialogs.ui 2012-03-20 08:00:09.000000000 +0000 @@ -1,6 +1,6 @@