Mercurial > p > roundup > code
annotate roundup/anypy/html.py @ 8224:5913ec1673c2
refactor: extract code as method from do_import
This started by trying to fix a resource error where the os.scandir
iterator was not closed for some reason (it should have been exhausted
and close). While the ResourceWarning is fixed with:
with os.scandir() as ...:
indented existing code
it breaks under python2. Trying a python2 friendly option:
dirscan = os.scandir()
...
if hasattr(dirscan,'close'):
dirscan.close()
doesn't fix the resource warning.
Using the 'with os.scandir()...' indented a nested block too far so I
extracted it into another method.
It is only this method that survives 8-(.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Wed, 18 Dec 2024 21:49:48 -0500 |
| parents | 7f888f046857 |
| children |
| rev | line source |
|---|---|
|
5837
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff
changeset
|
1 try: |
|
6027
ff57db595a58
flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents:
5837
diff
changeset
|
2 from html import escape as html_escape_ # python 3 |
|
ff57db595a58
flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents:
5837
diff
changeset
|
3 |
|
7769
7f888f046857
chore: ruff lint: replace str variable name with string
John Rouillard <rouilj@ieee.org>
parents:
6027
diff
changeset
|
4 def html_escape(string, quote=False): |
|
5837
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff
changeset
|
5 # html_escape under python 3 sets quote to true by default |
|
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff
changeset
|
6 # make it python 2 compatible |
|
7769
7f888f046857
chore: ruff lint: replace str variable name with string
John Rouillard <rouilj@ieee.org>
parents:
6027
diff
changeset
|
7 return html_escape_(string, quote=quote) |
|
5837
883c9e90b403
Fix problem with cgi.escape being depricated a different way. This way
John Rouillard <rouilj@ieee.org>
parents:
diff
changeset
|
8 except ImportError: |
|
6027
ff57db595a58
flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents:
5837
diff
changeset
|
9 # python 2 fallback |
|
ff57db595a58
flake8 cleanups whitespace formatting only.
John Rouillard <rouilj@ieee.org>
parents:
5837
diff
changeset
|
10 from cgi import escape as html_escape # noqa: F401 |