diff --git a/CHANGES.txt b/CHANGES.txt index 08d8e393fd..101ff94f19 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,7 +13,9 @@ https://mhammond.github.io/pywin32_installers.html. Coming in build 307, as yet unreleased -------------------------------------- + ### pywin32 +* Fixed `py.exe -m win32verstamp` command and other quote typos caused by Implied String Concatenation (#2225, @Avasam) * Fixed VT_SAFEARRAY(VT_RECORD) which were missing the last element (#2247) * Fixed `MFC redist DLLs not found` by preferring corresponding version but accepting different version (#2248, @andreabravetti) * Fixed `pywintypes.error: (5, 'RegOpenKeyEx', 'Access is denied.')` when running service with debug parameter and no elevation (#2238, @jmartens) diff --git a/Pythonwin/pywin/test/test_pywin.py b/Pythonwin/pywin/test/test_pywin.py index 14b4430e24..6389de930e 100644 --- a/Pythonwin/pywin/test/test_pywin.py +++ b/Pythonwin/pywin/test/test_pywin.py @@ -377,7 +377,7 @@ def t_print(*args): pywin.scintilla.IDLEenvironment.test() ed = scriptutils.GetActiveEditControl() doc = ed.GetDocument() - assert "hi " "there" in ed.GetTextRange() + assert "hi there" in ed.GetTextRange() assert doc.IsModified() # edit w auto-indent diff --git a/pywin32_postinstall.py b/pywin32_postinstall.py index b1b9cdd214..bddb8ccd33 100644 --- a/pywin32_postinstall.py +++ b/pywin32_postinstall.py @@ -260,7 +260,7 @@ def RegisterHelpFile(register=True, lib_dir=None): SetPyKeyVal("Help\\Pythonwin Reference", None, chm_file) return chm_file else: - print("NOTE: PyWin32.chm can not be located, so has not " "been registered") + print("NOTE: PyWin32.chm can not be located, so has not been registered") else: UnsetPyKeyVal("Help\\Pythonwin Reference", None, delete_key=True) return None diff --git a/setup.py b/setup.py index 03bc1dd738..4c50fb6fde 100644 --- a/setup.py +++ b/setup.py @@ -995,7 +995,7 @@ def link( # allow --skip-verstamp on the cmdline - but if it's not there, the # verstamp must work.) if not skip_verstamp: - args = ["py.exe", "-m" "win32verstamp"] + args = ["py.exe", "-m", "win32verstamp"] args.append(f"--version={pywin32_version}") args.append("--comments=https://github.com/mhammond/pywin32") args.append(f"--original-filename={os.path.basename(output_filename)}") diff --git a/win32/Demos/NetValidatePasswordPolicy.py b/win32/Demos/NetValidatePasswordPolicy.py index 86c3bc40bd..be9f3aa345 100644 --- a/win32/Demos/NetValidatePasswordPolicy.py +++ b/win32/Demos/NetValidatePasswordPolicy.py @@ -43,7 +43,7 @@ def main(): "-u", "--username", action="store", - help="The username to pass to the function (only for the " "change command", + help="The username to pass to the function (only for the 'change' command)", ) parser.add_option( diff --git a/win32/Demos/security/setkernelobjectsecurity.py b/win32/Demos/security/setkernelobjectsecurity.py index 34c8f44692..f82a7de516 100644 --- a/win32/Demos/security/setkernelobjectsecurity.py +++ b/win32/Demos/security/setkernelobjectsecurity.py @@ -112,9 +112,9 @@ new_sd = win32security.GetKernelObjectSecurity(ph, all_info) if new_sd.GetSecurityDescriptorDacl().GetAceCount() != dacl_ace_cnt + 1: - print("New dacl doesn" "t contain extra ace ????") + print("New dacl doesn't contain extra ace ????") if new_sd.GetSecurityDescriptorSacl().GetAceCount() != sacl_ace_cnt + 1: - print("New Sacl doesn" "t contain extra ace ????") + print("New Sacl doesn't contain extra ace ????") if ( win32security.LookupAccountSid("", new_sd.GetSecurityDescriptorOwner())[0] != "Power Users" diff --git a/win32/Demos/security/setnamedsecurityinfo.py b/win32/Demos/security/setnamedsecurityinfo.py index 8915a0df1a..6b5c342d2e 100644 --- a/win32/Demos/security/setnamedsecurityinfo.py +++ b/win32/Demos/security/setnamedsecurityinfo.py @@ -101,9 +101,9 @@ ## could do additional checking to make sure added ACE contains expected info if new_sd.GetSecurityDescriptorDacl().GetAceCount() != dacl_ace_cnt + 1: - print("New dacl doesn" "t contain extra ace ????") + print("New dacl doesn't contain extra ace ????") if new_sd.GetSecurityDescriptorSacl().GetAceCount() != sacl_ace_cnt + 1: - print("New Sacl doesn" "t contain extra ace ????") + print("New Sacl doesn't contain extra ace ????") if ( win32security.LookupAccountSid("", new_sd.GetSecurityDescriptorOwner())[0] != "Power Users" diff --git a/win32/Demos/security/setsecurityinfo.py b/win32/Demos/security/setsecurityinfo.py index d784d95099..a06a543905 100644 --- a/win32/Demos/security/setsecurityinfo.py +++ b/win32/Demos/security/setsecurityinfo.py @@ -102,9 +102,9 @@ new_sd = win32security.GetSecurityInfo(ph, win32security.SE_KERNEL_OBJECT, all_info) if new_sd.GetSecurityDescriptorDacl().GetAceCount() != dacl_ace_cnt + 1: - print("New dacl doesn" "t contain extra ace ????") + print("New dacl doesn't contain extra ace ????") if new_sd.GetSecurityDescriptorSacl().GetAceCount() != sacl_ace_cnt + 1: - print("New Sacl doesn" "t contain extra ace ????") + print("New Sacl doesn't contain extra ace ????") if ( win32security.LookupAccountSid("", new_sd.GetSecurityDescriptorOwner())[0] != "Power Users" diff --git a/win32/Demos/security/sspi/socket_server.py b/win32/Demos/security/sspi/socket_server.py index 6bf3806bb4..09f005b46f 100644 --- a/win32/Demos/security/sspi/socket_server.py +++ b/win32/Demos/security/sspi/socket_server.py @@ -187,7 +187,7 @@ def sspi_client(): serve() else: parser.error( - "You must supply 'client' or 'server' - " "use --help for details" + "You must supply 'client' or 'server' - use --help for details" ) except KeyboardInterrupt: pass diff --git a/win32/test/test_odbc.py b/win32/test/test_odbc.py index 85b577357a..7b61cb354d 100644 --- a/win32/test/test_odbc.py +++ b/win32/test/test_odbc.py @@ -225,7 +225,7 @@ def testDates(self): def test_set_nonzero_length(self): self.assertEqual( self.cur.execute( - "insert into %s (userid,username) " "values (?,?)" % self.tablename, + "insert into %s (userid,username) values (?,?)" % self.tablename, ["Frank", "Frank Millman"], ), 1, @@ -240,7 +240,7 @@ def test_set_nonzero_length(self): def test_set_zero_length(self): self.assertEqual( self.cur.execute( - "insert into %s (userid,username) " "values (?,?)" % self.tablename, + "insert into %s (userid,username) values (?,?)" % self.tablename, [b"Frank", ""], ), 1, @@ -251,7 +251,7 @@ def test_set_zero_length(self): def test_set_zero_length_unicode(self): self.assertEqual( self.cur.execute( - "insert into %s (userid,username) " "values (?,?)" % self.tablename, + "insert into %s (userid,username) values (?,?)" % self.tablename, ["Frank", ""], ), 1,