Mercurial > hg-stable
changeset 42064:0e9066db5e44
automation: use raw strings when there are backslashes
Otherwise Python 3.8 complains.
Differential Revision: https://phab.mercurial-scm.org/D6201
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 04 Apr 2019 18:01:02 -0700 |
| parents | 912d82daeda3 |
| children | fecbd93a5f08 |
| files | contrib/automation/hgautomation/aws.py contrib/automation/hgautomation/windows.py |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/automation/hgautomation/aws.py Thu Apr 04 17:47:25 2019 -0700 +++ b/contrib/automation/hgautomation/aws.py Thu Apr 04 18:01:02 2019 -0700 @@ -118,7 +118,7 @@ # and configure WinRM. # Inspired by the User Data script used by Packer # (from https://www.packer.io/intro/getting-started/build-image.html). -WINDOWS_USER_DATA = ''' +WINDOWS_USER_DATA = r''' <powershell> # TODO enable this once we figure out what is failing.
--- a/contrib/automation/hgautomation/windows.py Thu Apr 04 17:47:25 2019 -0700 +++ b/contrib/automation/hgautomation/windows.py Thu Apr 04 18:01:02 2019 -0700 @@ -114,7 +114,7 @@ commands = [ '$ErrorActionPreference = "Stop"', 'Repair-AuthorizedKeyPermission -FilePath %s -Confirm:$false' % path, - 'icacls %s /remove:g "NT Service\sshd"' % path, + r'icacls %s /remove:g "NT Service\sshd"' % path, ] run_powershell(winrm_client, '\n'.join(commands)) @@ -192,7 +192,7 @@ """Find path to newest file in dist/ directory matching a pattern.""" res = winrm_client.execute_ps( - '$v = Get-ChildItem -Path C:\hgdev\src\dist -Filter "%s" ' + r'$v = Get-ChildItem -Path C:\hgdev\src\dist -Filter "%s" ' '| Sort-Object LastWriteTime -Descending ' '| Select-Object -First 1\n' '$v.name' % pattern @@ -270,8 +270,8 @@ ``test_flags`` is a str representing extra arguments to pass to ``run-tests.py``. """ - if not re.match('\d\.\d', python_version): - raise ValueError('python_version must be \d.\d; got %s' % + if not re.match(r'\d\.\d', python_version): + raise ValueError(r'python_version must be \d.\d; got %s' % python_version) if arch not in ('x86', 'x64'):