Merge pull request #99 from abg/feature/avoid_unicode_literals

Remove unicode_literals imports from dbsake.cli
abg · Oct 10, 2016 · 6e3618b · 6e3618b
2 parents 6ac3b8d + 1300bc3
commit 6e3618b
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 30 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,14 @@
 History
 =======
 
+2.1.1 (unreleased)
+------------------
+
+Bugs fixed:
+
+   * Remove unicode_literals usage in cli to avoid noisy warnings from click
+     (Issue #96)
+
 2.1.0 (2015-01-28)
 ------------------
 

diff --git a/dbsake/cli/__init__.py b/dbsake/cli/__init__.py
@@ -4,8 +4,6 @@
 
 Main dbsake cli entrypoint
 """
-from __future__ import unicode_literals
-
 import logging
 import sys
 

diff --git a/dbsake/cli/cmd/frm.py b/dbsake/cli/cmd/frm.py
@@ -4,8 +4,6 @@
 
 Dump schema from MySQL .frm files
 """
-from __future__ import unicode_literals
-
 import sys
 
 import click

diff --git a/dbsake/cli/cmd/fs.py b/dbsake/cli/cmd/fs.py
@@ -5,8 +5,6 @@
 Commands for interacting with the local filesystem
 
 """
-from __future__ import unicode_literals
-
 import sys
 
 import click

diff --git a/dbsake/cli/cmd/mycnf.py b/dbsake/cli/cmd/mycnf.py
@@ -4,8 +4,6 @@
 
 MySQL option file utilitie
 """
-from __future__ import unicode_literals
-
 import sys
 
 import click

diff --git a/dbsake/cli/cmd/sandbox.py b/dbsake/cli/cmd/sandbox.py
@@ -4,8 +4,6 @@
 
 Command interface to create isolated MySQL "sandbox" instances
 """
-from __future__ import unicode_literals
-
 import os
 import sys
 

diff --git a/dbsake/cli/cmd/sieve.py b/dbsake/cli/cmd/sieve.py
@@ -4,8 +4,6 @@
 
 Advanced filtering of mysqldump backup files
 """
-from __future__ import unicode_literals
-
 import errno
 import signal
 import sys

diff --git a/dbsake/cli/cmd/unpack.py b/dbsake/cli/cmd/unpack.py
@@ -6,7 +6,6 @@
 
 """
 from __future__ import print_function
-from __future__ import unicode_literals
 
 import sys
 

diff --git a/tests/frmdump/test_frm.py b/tests/frmdump/test_frm.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 from __future__ import print_function
 
 import codecs
@@ -45,14 +44,13 @@ def test_frm_decode(frm_path, expected_sql):
 
 
 def test_frm_tablename():
-    sample = 'Настройки'
+    sample = u'Настройки'
     expected_encoding = b'@T0@g0@x0@y0@w0@u0@p0@q0@o0'
 
     result = tablename.encode(sample)
 
     assert result == expected_encoding
 
-    print("result => %r" % (result, ))
     orig = tablename.decode(result)
 
     assert orig == sample
diff --git a/tests/test_dbsake.py b/tests/test_dbsake.py
@@ -1,8 +1,6 @@
 """
 Test dbsake cli
 """
-from __future__ import unicode_literals
-
 from click.testing import CliRunner
 
 import dbsake

diff --git a/tests/test_fs.py b/tests/test_fs.py
@@ -1,8 +1,6 @@
 """
 Test dbsake sandbox
 """
-from __future__ import unicode_literals
-
 from click.testing import CliRunner
 
 from dbsake.cli.cmd import fs as fs_cli

diff --git a/tests/test_pycompat.py b/tests/test_pycompat.py
@@ -1,8 +1,6 @@
 """
 Test dbsake.pycompat
 """
-from __future__ import unicode_literals
-
 import errno
 import os
 import shutil

diff --git a/tests/test_sandbox.py b/tests/test_sandbox.py
@@ -1,8 +1,6 @@
 """
 Test dbsake sandbox
 """
-from __future__ import unicode_literals
-
 import os
 import tarfile
 

diff --git a/tests/test_sieve.py b/tests/test_sieve.py
@@ -1,8 +1,6 @@
 """
 Test dbsake cli
 """
-from __future__ import unicode_literals
-
 import os
 
 from click.testing import CliRunner

diff --git a/tests/test_upgrademycnf.py b/tests/test_upgrademycnf.py
@@ -1,8 +1,6 @@
 """
 Test dbsake sandbox
 """
-from __future__ import unicode_literals
-
 import os
 
 from click.testing import CliRunner

diff --git a/tests/test_util.py b/tests/test_util.py
@@ -2,8 +2,6 @@
 Test dbsake.util.compression
 
 """
-from __future__ import unicode_literals
-
 from dbsake.util import compression