Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2020-03-13 21:56:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osc" Fri Mar 13 21:56:10 2020 rev:148 rq:784534 version:0.168.2 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2020-03-11 18:56:53.595716381 +0100 +++ /work/SRC/openSUSE:Factory/.osc.new.3160/osc.changes 2020-03-13 21:56:11.476833671 +0100 @@ -1,0 +2,7 @@ +Fri Mar 13 06:49:27 UTC 2020 - Marco Strigl <[email protected]> + +- 0.168.2 + * use helper method _html_escape to enable python3.8 and python2.* + compatibility (boo#1166537) + +------------------------------------------------------------------- Old: ---- osc-0.168.1.tar.gz New: ---- osc-0.168.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.8FY9YB/_old 2020-03-13 21:56:13.612835007 +0100 +++ /var/tmp/diff_new_pack.8FY9YB/_new 2020-03-13 21:56:13.616835010 +0100 @@ -27,12 +27,12 @@ %define use_python python %endif -%define version_unconverted 0.168.1 +%define version_unconverted 0.168.2 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc Name: osc -Version: 0.168.1 +Version: 0.168.2 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.8FY9YB/_old 2020-03-13 21:56:13.652835032 +0100 +++ /var/tmp/diff_new_pack.8FY9YB/_new 2020-03-13 21:56:13.656835034 +0100 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.168.1 +pkgver=0.168.2 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.8FY9YB/_old 2020-03-13 21:56:13.668835042 +0100 +++ /var/tmp/diff_new_pack.8FY9YB/_new 2020-03-13 21:56:13.668835042 +0100 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.168.1</param> - <param name="revision">0.168.1</param> + <param name="version">0.168.2</param> + <param name="revision">0.168.2</param> <param name="url">git://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.8FY9YB/_old 2020-03-13 21:56:13.696835060 +0100 +++ /var/tmp/diff_new_pack.8FY9YB/_new 2020-03-13 21:56:13.696835060 +0100 @@ -1,4 +1,4 @@ -osc (0.168.1) unstable; urgency=low +osc (0.168.2) unstable; urgency=low - Package for Python3 -- Nick Brown <[email protected]> Wed, 30 Jan 2020 14:49:30 +0000 ++++++ osc-0.168.1.tar.gz -> osc-0.168.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.168.1/NEWS new/osc-0.168.2/NEWS --- old/osc-0.168.1/NEWS 2020-03-11 17:10:42.000000000 +0100 +++ new/osc-0.168.2/NEWS 2020-03-13 07:44:34.000000000 +0100 @@ -1,3 +1,7 @@ +0.168.2 + - Use html.escape instead removed cgi.escape (boo#1166537) + enables python3.8 compatibility + 0.168.0 - MR creation honors orev now (bsc#1160446) - allow "osc r --vertical" for projects diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.168.1/osc/commandline.py new/osc-0.168.2/osc/commandline.py --- old/osc-0.168.1/osc/commandline.py 2020-03-11 17:10:42.000000000 +0100 +++ new/osc-0.168.2/osc/commandline.py 2020-03-13 07:44:34.000000000 +0100 @@ -34,6 +34,8 @@ except ImportError: from .util.helper import cmp_to_key +from .util.helper import _html_escape + from operator import itemgetter MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands" @@ -1241,7 +1243,6 @@ if len(args) < 2 and is_project_dir(os.getcwd()): if opts.diff: raise oscerr.WrongOptions('\'--diff\' is not supported in a project working copy') - import html project = store_read_project(os.curdir) sr_ids = [] @@ -1295,7 +1296,7 @@ (project, target_prj_block, options_block) actionxml += s xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ - (actionxml, html.escape(opts.message or "", quote=False)) + (actionxml, _html_escape(opts.message or "")) u = makeurl(apiurl, ['request'], query='cmd=create&addrevision=1') f = http_POST(u, data=xml) @@ -1872,9 +1873,8 @@ if not opts.message: opts.message = edit_message() - import cgi xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ - (actionsxml, html.escape(opts.message or "", quote=False)) + (actionsxml, _html_escape(opts.message or "")) u = makeurl(apiurl, ['request'], query='cmd=create') f = http_POST(u, data=xml) @@ -1911,7 +1911,6 @@ ${cmd_option_list} """ - import cgi args = slash_split(args) apiurl = self.get_api_url() @@ -1966,7 +1965,7 @@ else: r.add_action('add_role', tgt_project=project, tgt_package=package, person_name=user, person_role=role) - r.description = html.escape(opts.message or '', quote=False) + r.description = _html_escape(opts.message or '') r.create(apiurl) print(r.reqid) @@ -1991,8 +1990,6 @@ osc deletereq [-m TEXT] PROJECT [--all|--repository REPOSITORY] ${cmd_option_list} """ - import cgi - args = slash_split(args) project = None @@ -2033,7 +2030,7 @@ r = Request() r.add_action('delete', tgt_project=project, tgt_package=package, tgt_repository=repository) - r.description = cgi.escape(opts.message) + r.description = _html_escape(opts.message) if opts.accept_in_hours: r.accept_at_in_hours(int(opts.accept_in_hours)) r.create(self.get_api_url()) @@ -2054,8 +2051,6 @@ osc changedevelrequest PROJECT PACKAGE DEVEL_PROJECT [DEVEL_PACKAGE] """ - import cgi - if len(args) == 0 and is_package_dir('.') and find_default_project(): wd = os.curdir devel_project = store_read_project(wd) @@ -2083,7 +2078,7 @@ r = Request() r.add_action('change_devel', src_project=devel_project, src_package=devel_package, tgt_project=project, tgt_package=package) - r.description = html.escape(opts.message, quote=False) + r.description = _html_escape(opts.message) r.create(self.get_api_url()) print(r.reqid) @@ -2609,7 +2604,6 @@ # check for devel instances after accepted requests if cmd in ['accept']: - import cgi sr_actions = rq.get_actions('submit') for action in sr_actions: u = makeurl(apiurl, ['/search/package'], { @@ -2649,7 +2643,7 @@ project, package) msg = "%s (forwarded request %s from %s)" % (rq.description, reqid, rq.creator) rid = create_submit_request(apiurl, action.tgt_project, action.tgt_package, - project, package, html.escape(msg, quote=False)) + project, package, _html_escape(msg)) print(msg) print("New request #", rid) for req in reqs: @@ -8219,9 +8213,8 @@ else: message = edit_message() - import cgi xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ - (requestactionsxml, html.escape(message or "", quote=False)) + (requestactionsxml, _html_escape(message or "")) u = makeurl(apiurl, ['request'], query='cmd=create') f = http_POST(u, data=xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.168.1/osc/core.py new/osc-0.168.2/osc/core.py --- old/osc-0.168.1/osc/core.py 2020-03-11 17:10:42.000000000 +0100 +++ new/osc-0.168.2/osc/core.py 2020-03-13 07:44:34.000000000 +0100 @@ -5,7 +5,7 @@ from __future__ import print_function -__version__ = '0.168.0' +__version__ = '0.168.2' # __store_version__ is to be incremented when the format of the working copy # "store" changes in an incompatible way. Please add any needed migration @@ -61,7 +61,7 @@ except ImportError: from .util.helper import cmp_to_key -from osc.util.helper import decode_list, decode_it, raw_input +from osc.util.helper import decode_list, decode_it, raw_input, _html_escape try: # python 2.6 and python 2.7 @@ -4177,18 +4177,16 @@ # create a maintenance release request def create_release_request(apiurl, src_project, message=''): - import html r = Request() # api will complete the request r.add_action('maintenance_release', src_project=src_project) # XXX: clarify why we need the unicode(...) stuff - r.description = html.escape(unicode(message, 'utf8'), quote=False) + r.description = _html_escape(unicode(message, 'utf8')) r.create(apiurl) return r # create a maintenance incident per request def create_maintenance_request(apiurl, src_project, src_packages, tgt_project, tgt_releaseproject, opt_sourceupdate, message='', enforce_branching=False, rev=None): - import html r = Request() if src_packages: for p in src_packages: @@ -4196,7 +4194,7 @@ else: r.add_action('maintenance_incident', src_project=src_project, tgt_project=tgt_project, tgt_releaseproject=tgt_releaseproject, opt_sourceupdate = opt_sourceupdate) # XXX: clarify why we need the unicode(...) stuff - r.description = html.escape(unicode(message, 'utf8'), quote=False) + r.description = _html_escape(unicode(message, 'utf8')) r.create(apiurl, addrevision=True, enforce_branching=enforce_branching) return r @@ -4204,8 +4202,6 @@ src_project, src_package=None, dst_project=None, dst_package=None, message="", orev=None, src_update=None, dst_updatelink=None): - - import html options_block = "" package = "" if src_package: @@ -4241,9 +4237,9 @@ orev or show_upstream_rev(apiurl, src_project, src_package), targetxml, options_block, - html.escape(message, quote=False)) + _html_escape(message)) - # Don't do html.escape(unicode(message, "utf8"))) above. + # Don't do _html_escape(unicode(message, "utf8"))) above. # Promoting the string to utf8, causes the post to explode with: # uncaught exception: Fatal error: Start tag expected, '<' not found at :1. # I guess, my original workaround was not that bad. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.168.1/osc/util/helper.py new/osc-0.168.2/osc/util/helper.py --- old/osc-0.168.1/osc/util/helper.py 2020-03-11 17:10:42.000000000 +0100 +++ new/osc-0.168.2/osc/util/helper.py 2020-03-13 07:44:34.000000000 +0100 @@ -3,6 +3,11 @@ # and distributed under the terms of the GNU General Public Licence, # either version 2, or (at your option) any later version. +try: + import html +except ImportError: + import cgi as html + from osc import oscerr def cmp_to_key(mycmp): @@ -83,3 +88,7 @@ except EOFError: # interpret ctrl-d as user abort raise oscerr.UserAbort() + + +def _html_escape(data): + return html.escape(data, quote=False) ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.8FY9YB/_old 2020-03-13 21:56:13.992835245 +0100 +++ /var/tmp/diff_new_pack.8FY9YB/_new 2020-03-13 21:56:13.992835245 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.168.1 +Version: 0.168.2 Binary: osc Maintainer: Adrian Schroeter <[email protected]> Architecture: any
