Skip to content

adodbapi: Merge single-line implicitly concatenated strings #2242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhammond merged 3 commits into from
May 27, 2024
Merged

adodbapi: Merge single-line implicitly concatenated strings #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11d310d
Merge single-line implicitly concatenated strings
Avasam Apr 10, 2024
6595b6d
Merge branch 'main' of https://github.com/mhammond/pywin32 into adodb…
Avasam Apr 12, 2024
4bd803b
sort imports
Avasam Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion adodbapi/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@


def setup_package():
from setuptools.command.build_py import build_py
from setuptools import setup
from setuptools.command.build_py import build_py

setup(
cmdclass={"build_py": build_py},
Expand Down
6 changes: 3 additions & 3 deletions adodbapi/test/dbapi20.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,12 @@ def _paraminsert(self, cur):
self.assertEqual(
beers[0],
"Cooper's",
"cursor.fetchall retrieved incorrect data, or data inserted " "incorrectly",
"cursor.fetchall retrieved incorrect data, or data inserted incorrectly",
)
self.assertEqual(
beers[1],
"Victoria Bitter",
"cursor.fetchall retrieved incorrect data, or data inserted " "incorrectly",
"cursor.fetchall retrieved incorrect data, or data inserted incorrectly",
)
trouble = "thi%s :may ca%(u)se? troub:1e"
self.assertEqual(
Expand Down Expand Up @@ -541,7 +541,7 @@ def test_fetchone(self):
self.assertEqual(
cur.fetchone(),
None,
"cursor.fetchone should return None if a query retrieves " "no rows",
"cursor.fetchone should return None if a query retrieves no rows",
)
self.assertTrue(cur.rowcount in (-1, 0))

Expand Down