Merge remote-tracking branch 'origin' into default-socket-location

Author: gfrlv

.travis.yml

@@ -1,9 +1,8 @@
 language: python
 python:
-  - "2.7"
-  - "3.4"
-  - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
 
 matrix:
   include:

changelog.md

@@ -1,13 +1,33 @@
-TBD
-===
+1.21.1
+======
+
+Bug Fixes:
+----------
+
+* Fix broken auto-completion for favorite queries (Thanks: [Amjith]).
+* Fix undefined variable exception when running with --no-warn (Thanks: [Georgy Frolov])
+
+1.21.0
+======
 
 Features:
 ---------
 * Added DSN alias name as a format specifier to the prompt (Thanks: [Georgy Frolov]).
 * Mark `update` without `where`-clause as destructive query (Thanks: [Klaus Wünschel]).
 * Added DELIMITER command (Thanks: [Georgy Frolov])
 * Added clearer error message when failing to connect to the default socket.
+* Extend main.is_dropping_database check with create after delete statement.
+* Search `${XDG_CONFIG_HOME}/mycli/myclirc` after `${HOME}/.myclirc` and before `/etc/myclirc` (Thanks: [Takeshi D. Itoh])
 
+Bug Fixes:
+----------
+
+* Allow \o command more than once per session (Thanks: [Georgy Frolov])
+* Fixed crash when the query dropping the current database starts with a comment (Thanks: [Georgy Frolov])
+
+Internal:
+---------
+* deprecate python versions 2.7, 3.4, 3.5; support python 3.8
 
 1.20.1
 ======
@@ -17,7 +37,6 @@ Bug Fixes:
 
 * Fix an error when using login paths with an explicit database name (Thanks: [Thomas Roten]).
 
-
 1.20.0
 ======
 

mycli/AUTHORS

@@ -68,6 +68,9 @@ Contributors:
   * Mike Palandra
   * Georgy Frolov
   * Jonathan Lloyd
+  * Jakub Boukal
+  * Takeshi D. Itoh
+  * laixintao
 
 Creator:
 --------

mycli/__init__.py

@@ -1 +1 @@
-__version__ = '1.20.1'
+__version__ = '1.21.1'

mycli/clibuffer.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from prompt_toolkit.enums import DEFAULT_BUFFER
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.application import get_app

mycli/clistyle.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 import pygments.styles

mycli/clitoolbar.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from prompt_toolkit.key_binding.vi_state import InputMode
 from prompt_toolkit.application import get_app
 from prompt_toolkit.enums import EditingMode

mycli/compat.py

@@ -1,9 +1,6 @@
-# -*- coding: utf-8 -*-
 """Platform and Python version compatibility support."""
 
 import sys
 
 
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
 WIN = sys.platform in ('win32', 'cygwin')

mycli/config.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import shutil
 from io import BytesIO, TextIOWrapper
 import logging
@@ -240,7 +239,7 @@ def _remove_pad(line):
 
     if pad_length > len(line) or len(set(line[-pad_length:])) != 1:
         # Pad length should be less than or equal to the length of the
-        # plaintext. The pad should have a single unqiue byte.
+        # plaintext. The pad should have a single unique byte.
         logger.warning('Invalid pad found in login path file.')
         return False