mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-12 23:56:13 +01:00
Code

Merge branch 'fix__html_escape_usage' of https://github.com/marcus-h/osc

Browse Source 
Avoid superfluous/excessive usage of _html_escape.
This commit is contained in:
Marcus Huewe 2020-12-05 19:26:59 +01:00
commit 745dc1180d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osc/commandline.py
View File

@ -1976,7 +1976,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 = _html_escape(opts.message or '')
r.description = opts.message
r.create(apiurl)
print(r.reqid)
@ -2043,7 +2043,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
r = Request()
r.add_action('delete', tgt_project=project, tgt_package=package, tgt_repository=repository)
r.description = _html_escape(opts.message)
r.description = opts.message
if opts.accept_in_hours:
r.accept_at_in_hours(int(opts.accept_in_hours))
r.create(self.get_api_url())
@ -2093,7 +2093,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 = _html_escape(opts.message)
r.description = opts.message
r.create(self.get_api_url())
print(r.reqid)
@ -2661,7 +2661,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, _html_escape(msg))
project, package, msg)
print(msg)
print("New request #", rid)
for req in reqs:
@ -3169,7 +3169,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
r.add_action('release', src_project=source_project, src_package=pac)
else:
r.add_action('release', src_project=source_project)
r.description = _html_escape(opts.message)
r.description = opts.message
r.create(apiurl)
print(r.reqid)

4
osc/core.py
View File

@ -4191,7 +4191,7 @@ def create_release_request(apiurl, src_project, message=''):
# 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'))
r.description = unicode(message, 'utf8')
r.create(apiurl)
return r
@ -4204,7 +4204,7 @@ def create_maintenance_request(apiurl, src_project, src_packages, tgt_project, t
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'))
r.description = unicode(message, 'utf8')
r.create(apiurl, addrevision=True, enforce_branching=enforce_branching)
return r