Merge branch 'azure' into azure-1.1

Conflicts: sql_server/pyodbc/base.py
michiya · May 27, 2014 · a362faf · a362faf
2 parents 124502c + 0a9b9a9
commit a362faf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sql_server/pyodbc/base.py b/sql_server/pyodbc/base.py
@@ -238,7 +238,7 @@ def get_new_connection(self, conn_params):
             self.use_legacy_datetime = True
             self.supports_mars = False
 
-        ms_drv_names = re.compile('^((LIB)?SQLN?CLI|LIBMSODBCSQL)')
+        ms_drv_names = re.compile('^(LIB)?(SQLN?CLI|MSODBCSQL)')
 
         if drv_name == 'SQLSRV32.DLL' or ms_drv_names.match(drv_name):
             self.driver_needs_utf8 = False