diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-04-18 12:38:08 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-04-18 12:38:08 -0400 |
| commit | c718dea749204169db2b49ea5d18248cbfe6c76f (patch) | |
| tree | b58eebdd20bd8a61c0743f406456474d51b945df /lib/sqlalchemy/dialects/postgresql/psycopg2.py | |
| parent | 214efa53a0856909ab234498e5849c6412c5ccd9 (diff) | |
| download | sqlalchemy-c718dea749204169db2b49ea5d18248cbfe6c76f.tar.gz | |
- Fixed the psycopg2_version parsing in the
psycopg2 dialect.
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/psycopg2.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/psycopg2.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py index 2fceb7f17..2a3b4297c 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py @@ -252,10 +252,13 @@ class PGDialect_psycopg2(PGDialect): self.use_native_unicode = use_native_unicode self.supports_unicode_binds = use_native_unicode if self.dbapi and hasattr(self.dbapi, '__version__'): - m = re.match(r'(\d+)\.(\d+)\.(\d+)?', + m = re.match(r'(\d+)\.(\d+)(?:\.(\d+))?', self.dbapi.__version__) if m: - self.psycopg2_version = tuple(map(int, m.group(1, 2, 3))) + self.psycopg2_version = tuple( + int(x) + for x in m.group(1, 2, 3) + if x is not None) @classmethod def dbapi(cls): |