mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-08-24 15:18:54 +02:00
Code Activity

Use html.escape instead removed cgi.escape

Browse Source 
Fixes:

`Traceback (most recent call last):
  File "/usr/bin/osc", line 41, in <module>
    r = babysitter.run(osccli)
  File "/usr/lib/python3.8/site-packages/osc/babysitter.py", line 64, in run
    return prg.main(argv)
  File "/usr/lib/python3.8/site-packages/osc/cmdln.py", line 344, in main
    return self.cmd(args)
  File "/usr/lib/python3.8/site-packages/osc/cmdln.py", line 367, in cmd
    retval = self.onecmd(argv)
  File "/usr/lib/python3.8/site-packages/osc/cmdln.py", line 501, in onecmd
    return self._dispatch_cmd(handler, argv)
  File "/usr/lib/python3.8/site-packages/osc/cmdln.py", line 1232, in _dispatch_cmd
    return handler(argv[0], opts, *args)
  File "/usr/lib/python3.8/site-packages/osc/commandline.py", line 1458, in do_submitrequest
    result = create_submit_request(apiurl,
  File "/usr/lib/python3.8/site-packages/osc/core.py", line 4244, in create_submit_request
    cgi.escape(message))
AttributeError: module 'cgi' has no attribute 'escape'
`
`cgi.escape` was deprecated in python 3.2
This commit is contained in:
Ondřej Súkup
2020-03-11 16:33:20 +01:00
parent a8641a47c8
commit 6dbf103e10
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osc/commandline.py
View File

@@ -1241,7 +1241,7 @@ class Osc(cmdln.Cmdln):
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 cgi
import html
project = store_read_project(os.curdir)
sr_ids = []
@@ -1295,7 +1295,7 @@ class Osc(cmdln.Cmdln):
(project, target_prj_block, options_block)
actionxml += s
xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \
(actionxml, cgi.escape(opts.message or ""))
(actionxml, html.escape(opts.message or "", quote=False))
u = makeurl(apiurl, ['request'], query='cmd=create&addrevision=1')
f = http_POST(u, data=xml)
@@ -1874,7 +1874,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
import cgi
xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \
(actionsxml, cgi.escape(opts.message or ""))
(actionsxml, html.escape(opts.message or "", quote=False))
u = makeurl(apiurl, ['request'], query='cmd=create')
f = http_POST(u, data=xml)
@@ -1966,7 +1966,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
else:
r.add_action('add_role', tgt_project=project, tgt_package=package,
person_name=user, person_role=role)
r.description = cgi.escape(opts.message or '')
r.description = html.escape(opts.message or '', quote=False)
r.create(apiurl)
print(r.reqid)
@@ -2083,7 +2083,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
r = Request()
r.add_action('change_devel', src_project=devel_project, src_package=devel_package,
tgt_project=project, tgt_package=package)
r.description = cgi.escape(opts.message)
r.description = html.escape(opts.message, quote=False)
r.create(self.get_api_url())
print(r.reqid)
@@ -2649,7 +2649,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
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, cgi.escape(msg))
project, package, html.escape(msg, quote=False))
print(msg)
print("New request #", rid)
for req in reqs:
@@ -8221,7 +8221,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
import cgi
xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \
(requestactionsxml, cgi.escape(message or ""))
(requestactionsxml, html.escape(message or "", quote=False))
u = makeurl(apiurl, ['request'], query='cmd=create')
f = http_POST(u, data=xml)