From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 10 Jan 2006 02:30:54 +0000 (+0000)
Subject: tabs->spaces !  (also relies upon '2' being present in version id)
X-Git-Tag: rel_0_1_0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8c8240f2d23010cdc99db2cf51cd60a956e50ba;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

tabs->spaces !  (also relies upon '2' being present in version id)
---

diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index 6b1dbef465..539cd35d09 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -118,16 +118,13 @@ class PGSQLEngine(ansisql.ANSISQLEngine):
         else:
             self.module = module
         # figure psycopg version 1 or 2    
-	try:
-	    if self.module.__version__.startswith('2'):
-		self.version = 2
-	    else:
-		self.version = 1
-	except:
-	    if self.module.__name__.endswith('psycopg2'):
-		self.version = 2
-	    else:
-		self.version = 1
+        try:
+            if self.module.__version__.startswith('2'):
+                self.version = 2
+            else:
+                self.version = 1
+        except:
+            self.version = 1
         self.opts = opts or {}
         ansisql.ANSISQLEngine.__init__(self, **params)