Merging upstream version 1.24.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 5 insertions, 3 deletions

diff --git a/mycli/AUTHORS b/mycli/AUTHORS
index 308e962..d1f3a28 100644
--- a/mycli/AUTHORS
+++ b/mycli/AUTHORS
@@ -87,6 +87,7 @@ Contributors:
   * Zhaolong Zhu
   * Zhidong
   * Zhongyang Guan
+  * Arvind Mishra
 
 Created by:
 -----------
diff --git a/mycli/__init__.py b/mycli/__init__.py
index f7704b3..e10d6ee 100644
--- a/mycli/__init__.py
+++ b/mycli/__init__.py
@@ -1 +1 @@
-__version__ = '1.24.3'
+__version__ = '1.24.4'
diff --git a/mycli/magic.py b/mycli/magic.py
index b1a3268..aad229a 100644
--- a/mycli/magic.py
+++ b/mycli/magic.py
@@ -30,7 +30,7 @@ def mycli_line_magic(line):
         u = conn.session.engine.url
         _logger.debug('New mycli: %r', str(u))
 
-        mycli.connect(u.database, u.host, u.username, u.port, u.password)
+        mycli.connect(host=u.host, port=u.port, passwd=u.password, database=u.database, user=u.username, init_command=None)
         conn._mycli = mycli
 
     # For convenience, print the connection alias
diff --git a/mycli/main.py b/mycli/main.py
index 3f08e9c..c13ed78 100755
--- a/mycli/main.py
+++ b/mycli/main.py
@@ -2,6 +2,7 @@ from collections import defaultdict
 from io import open
 import os
 import sys
+import shutil
 import traceback
 import logging
 import threading
@@ -1054,7 +1055,7 @@ class MyCli(object):
         """Get the number of lines to reserve for the completion menu."""
         reserved_space_ratio = .45
         max_reserved_space = 8
-        _, height = click.get_terminal_size()
+        _, height = shutil.get_terminal_size()
         return min(int(round(height * reserved_space_ratio)), max_reserved_space)
 
     def get_last_query(self):