Merge branch 'azure-1.11' into azure-2.0

Author: michiya

sql_server/pyodbc/base.py

@@ -260,7 +260,7 @@ def get_new_connection(self, conn_params):
 
             if ms_drivers.match(driver):
                 if port:
-                    host = ','.join((host,port))
+                    host = ','.join((host, str(port)))
                 cstr_parts['SERVER'] = host
             elif options.get('host_is_server', False):
                 if port:

sql_server/pyodbc/client.py

@@ -26,7 +26,7 @@ def runshell(self):
             args = [self.executable_name]
             if server:
                 if port:
-                    server = ','.join((server, port))
+                    server = ','.join((server, str(port)))
                 args += ["-S", server]
             if user:
                 args += ["-U", user]