Skip to content

in none English environment pg instance, 'exists' will not in str(err), use DuplicateDatabase instead #229

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

Open
Pandaaaa906 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

in none English environment pg instance, 'exists' will not in str(err), use DuplicateDatabase instead #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d2fe64
in none English environment pg instance,
Pandaaaa906 May 9, 2022
758b5a2
Merge branch 'my8100:master' into dev
Pandaaaa906 Mar 6, 2024
d1924ce
Merge pull request #1 from Pandaaaa906/master
Pandaaaa906 Feb 27, 2026
db382a7
upgrade dependency
Pandaaaa906 Mar 3, 2026
81b2438
Merge branch 'update-dependency' into dev
Pandaaaa906 Mar 3, 2026
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
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
pip>=19.1.1
APScheduler==3.6.0
click==7.1.2
click>=7.1.2
colorama==0.4.0
Flask==2.0.0
Flask-Compress==1.4.0
Flask-SQLAlchemy==2.4.0
idna==2.7
idna==2.8
itsdangerous==2.0.0
Jinja2==3.0.0
logparser>=0.8.4
Expand Down
8 changes: 3 additions & 5 deletions scrapydweb/utils/setup_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,9 @@ def setup_postgresql(username, password, host, port):
except:
try:
cur.execute("CREATE DATABASE %s" % dbname)
except psycopg2.errors.DuplicateDatabase:
pass
except Exception as err:
# psycopg2.ProgrammingError: database "scrapydweb_apscheduler" already exists
if 'exists' in str(err):
pass
else:
raise
raise err
cur.close()
conn.close()
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
python_requires=">=3.6",
install_requires=[
"APScheduler==3.6.0", # Mar 18, 2019
"click==7.1.2", # Apr 28, 2020
"click>=7.1.2", # Apr 28, 2020
"colorama==0.4.0", # Oct 10, 2018
"Flask==2.0.0", # May 12, 2021
"Flask-Compress==1.4.0", # Jan 5, 2017
"Flask-SQLAlchemy==2.4.0", # Apr 25, 2019
"idna==2.7", # Jun 11, 2018
"idna==2.8", # Jun 11, 2018
"itsdangerous==2.0.0", # May 12, 2021
"Jinja2==3.0.0", # May 12, 2021
"logparser>=0.8.4",
Expand Down