Merge branch 'dev'

3 files changed, 8 insertions, 9 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 55700914..e1204086 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 #
 # Cmd2 unit/functional testing
 #
diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 8435ac1a..a7795bb6 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 #
 # Cmd2 unit/functional testing
 #
@@ -6,18 +7,14 @@
 
 import mock
 import pytest
-
 from conftest import run_cmd, _normalize
-import cmd2
+from six import StringIO
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+import cmd2
 
 
 def test_ver():
-    assert cmd2.__version__ == '0.6.9a'
+    assert cmd2.__version__ == '0.7.0'
 
 
 def test_base_help(base_app):
diff --git a/tests/test_transcript.py b/tests/test_transcript.py
index 06cf50b6..dfb37da7 100644
--- a/tests/test_transcript.py
+++ b/tests/test_transcript.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 #
 # Cmd2 functional testing based on transcript
 #
@@ -37,7 +38,7 @@ class CmdLineApp(Cmd):
             # self.stdout.write is better than "print", because Cmd can be
             # initialized with a non-standard output destination
 
-    do_say = do_speak    # now "say" is a synonym for "speak"
+    do_say = do_speak  # now "say" is a synonym for "speak"
     do_orate = do_speak  # another synonym, but this one takes multi-line input
 
 
@@ -45,7 +46,7 @@ class CmdLineApp(Cmd):
 def _cmdline_app():
     c = CmdLineApp()
     c.stdout = StdOut()
-    #c.shortcuts.update({'&': 'speak', 'h': 'hello'})
+    # c.shortcuts.update({'&': 'speak', 'h': 'hello'})
     c.settable.append('maxrepeats   Max number of `--repeat`s allowed')
     return c