diff options
| author | martinko | 2014-04-09 15:59:41 +0000 |
|---|---|---|
| committer | martinko | 2014-04-09 15:59:41 +0000 |
| commit | aaf84dce7c36f7228fe449ff8e19f4a1a88dcf82 (patch) | |
| tree | 61387285df68b9e8ca6600959fbe0871565ce6cf /python/skytools/scripting.py | |
| parent | c4640cc4f5097a3b50d5ecca5ae503bcfacddb8f (diff) | |
| parent | 6cbc2e5037323718fed3d7a1ff7d8964db669599 (diff) | |
Merge branch 'hotfix/3.2.1' into develop
Diffstat (limited to 'python/skytools/scripting.py')
| -rw-r--r-- | python/skytools/scripting.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py index 68ddc4d3..77c1bec5 100644 --- a/python/skytools/scripting.py +++ b/python/skytools/scripting.py @@ -14,7 +14,6 @@ import signal import sys import time -import psycopg2 import skytools import skytools.skylog @@ -958,7 +957,7 @@ class DBScript(BaseScript): sql_retry_formula_a = self.cf.getint("sql_retry_formula_a", 1) sql_retry_formula_b = self.cf.getint("sql_retry_formula_b", 5) sql_retry_formula_cap = self.cf.getint("sql_retry_formula_cap", 60) - elist = exceptions or (psycopg2.OperationalError,) + elist = exceptions or tuple([]) stime = time.time() tried = 0 dbc = None |