From c718dea749204169db2b49ea5d18248cbfe6c76f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 18 Apr 2011 12:38:08 -0400 Subject: - Fixed the psycopg2_version parsing in the psycopg2 dialect. --- lib/sqlalchemy/dialects/postgresql/psycopg2.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/dialects/postgresql/psycopg2.py') 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): -- cgit v1.2.1