apply numpy docstyle

This commit is contained in:
Benedikt Brückmann 2021-06-14 08:34:57 +02:00
parent 01b9fb1549
commit 9038161b70
2 changed files with 2 additions and 6 deletions

View file

@ -4528,7 +4528,7 @@ NDKS = [
def handle_retree_error_on_windows(function, path, excinfo): def handle_retree_error_on_windows(function, path, excinfo):
"""Python can't remove a readonly file on Windows so chmod first""" """Python can't remove a readonly file on Windows so chmod first."""
if function in (os.unlink, os.rmdir, os.remove) and excinfo[0] == PermissionError: if function in (os.unlink, os.rmdir, os.remove) and excinfo[0] == PermissionError:
os.chmod(path, stat.S_IWRITE) os.chmod(path, stat.S_IWRITE)
function(path) function(path)

View file

@ -249,11 +249,7 @@ def get_lastbuild(builds):
def check_update_check_data_url(app): def check_update_check_data_url(app):
<<<<<<< HEAD """Updatecheckdata must have a valid HTTPS URL to protect checkupdates runs."""
"""UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs"""
=======
"""UpdateCheckData must have a valid HTTPS URL to protect checkupdates runs."""
>>>>>>> c380427b (rewrite docstrings to match numpy style guide)
if app.UpdateCheckData and app.UpdateCheckMode == 'HTTP': if app.UpdateCheckData and app.UpdateCheckMode == 'HTTP':
urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|') urlcode, codeex, urlver, verex = app.UpdateCheckData.split('|')
for url in (urlcode, urlver): for url in (urlcode, urlver):