From 3d2fe64d50c9022648ebb61f2d701af680ba4176 Mon Sep 17 00:00:00 2001 From: Pandaaaa906 Date: Mon, 9 May 2022 13:26:59 +0800 Subject: [PATCH] in none English environment pg instance, 'exists' will not in str(err), use DuplicateDatabase instead --- scrapydweb/utils/setup_database.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scrapydweb/utils/setup_database.py b/scrapydweb/utils/setup_database.py index 26ad61d..d1ec606 100644 --- a/scrapydweb/utils/setup_database.py +++ b/scrapydweb/utils/setup_database.py @@ -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()