24 files changed, 34 insertions, 15 deletions

diff --git a/_pytest/conftest.py b/_pytest/conftest.py
index 3a972e8..f744dae 100644
--- a/_pytest/conftest.py
+++ b/_pytest/conftest.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import json
 import pytest
diff --git a/_pytest/test_eventrouter.py b/_pytest/test_eventrouter.py
index 718ce18..b22fec5 100644
--- a/_pytest/test_eventrouter.py
+++ b/_pytest/test_eventrouter.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import pytest
 from wee_slack import EventRouter, SlackRequest
diff --git a/_pytest/test_everything.py b/_pytest/test_everything.py
index 2651c5d..5ac4b62 100644
--- a/_pytest/test_everything.py
+++ b/_pytest/test_everything.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import glob
 import json
diff --git a/_pytest/test_formatting.py b/_pytest/test_formatting.py
index c35b70e..2f03c6a 100644
--- a/_pytest/test_formatting.py
+++ b/_pytest/test_formatting.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 import pytest
 
 import wee_slack
diff --git a/_pytest/test_linkifytext.py b/_pytest/test_linkifytext.py
index fea6ab8..a4db120 100644
--- a/_pytest/test_linkifytext.py
+++ b/_pytest/test_linkifytext.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
 
 from wee_slack import linkify_text
 
diff --git a/_pytest/test_presencechange.py b/_pytest/test_presencechange.py
index 4e02640..71a992b 100644
--- a/_pytest/test_presencechange.py
+++ b/_pytest/test_presencechange.py
@@ -1,3 +1,4 @@
+from __future__ import print_function, unicode_literals
 
 def test_PresenceChange(realish_eventrouter, mock_websocket):
 
diff --git a/_pytest/test_process_message.py b/_pytest/test_process_message.py
index 2077380..4dc24e5 100644
--- a/_pytest/test_process_message.py
+++ b/_pytest/test_process_message.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import json
 
diff --git a/_pytest/test_processreply.py b/_pytest/test_processreply.py
index b5ebb9e..2cf71ec 100644
--- a/_pytest/test_processreply.py
+++ b/_pytest/test_processreply.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 #from wee_slack import process_reply
 
diff --git a/_pytest/test_processsubteamcreated.py b/_pytest/test_processsubteamcreated.py
index 7d403db..9cc9201 100644
--- a/_pytest/test_processsubteamcreated.py
+++ b/_pytest/test_processsubteamcreated.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 import glob
 import json
 
diff --git a/_pytest/test_processsubteamupdated.py b/_pytest/test_processsubteamupdated.py
index 34fd302..5781240 100644
--- a/_pytest/test_processsubteamupdated.py
+++ b/_pytest/test_processsubteamupdated.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 import glob
 from mock import patch, call
 from wee_slack import SlackTeam, SlackSubteam
diff --git a/_pytest/test_processteamjoin.py b/_pytest/test_processteamjoin.py
index 6336bff..64e704a 100644
--- a/_pytest/test_processteamjoin.py
+++ b/_pytest/test_processteamjoin.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 import glob
 import json
diff --git a/_pytest/test_sendmessage.py b/_pytest/test_sendmessage.py
index fe11f46..9446e07 100644
--- a/_pytest/test_sendmessage.py
+++ b/_pytest/test_sendmessage.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 def test_send_message(realish_eventrouter, mock_websocket):
     e = realish_eventrouter
diff --git a/_pytest/test_slackchannel.py b/_pytest/test_slackchannel.py
index 9f48625..fee9238 100644
--- a/_pytest/test_slackchannel.py
+++ b/_pytest/test_slackchannel.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from mock import Mock
 #from wee_slack import SlackChannel
diff --git a/_pytest/test_slackdmchannel.py b/_pytest/test_slackdmchannel.py
index 15b0626..c6dc224 100644
--- a/_pytest/test_slackdmchannel.py
+++ b/_pytest/test_slackdmchannel.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from mock import Mock
 #from wee_slack import SlackChannel
diff --git a/_pytest/test_slackgroupchannel.py b/_pytest/test_slackgroupchannel.py
index 969218b..8da15af 100644
--- a/_pytest/test_slackgroupchannel.py
+++ b/_pytest/test_slackgroupchannel.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from mock import Mock
 #from wee_slack import SlackChannel
diff --git a/_pytest/test_slackmpdmchannel.py b/_pytest/test_slackmpdmchannel.py
index 47c7d55..4a9d8da 100644
--- a/_pytest/test_slackmpdmchannel.py
+++ b/_pytest/test_slackmpdmchannel.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from mock import Mock
 #from wee_slack import SlackChannel
diff --git a/_pytest/test_slackrequest.py b/_pytest/test_slackrequest.py
index b947d13..0163250 100644
--- a/_pytest/test_slackrequest.py
+++ b/_pytest/test_slackrequest.py
@@ -1,4 +1,4 @@
-from __future__ import print_function
+from __future__ import print_function, unicode_literals
 
 from wee_slack import SlackRequest, EventRouter
 
diff --git a/_pytest/test_slackteam.py b/_pytest/test_slackteam.py
index fd21ec8..82a112d 100644
--- a/_pytest/test_slackteam.py
+++ b/_pytest/test_slackteam.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 from wee_slack import SlackTeam, EventRouter
 
 def test_SlackTeam():
diff --git a/_pytest/test_slackts.py b/_pytest/test_slackts.py
index 87f43a7..a77ba07 100644
--- a/_pytest/test_slackts.py
+++ b/_pytest/test_slackts.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 from wee_slack import SlackTS
 
 
diff --git a/_pytest/test_topic_command.py b/_pytest/test_topic_command.py
index 9d9a35e..c8dc8a3 100644
--- a/_pytest/test_topic_command.py
+++ b/_pytest/test_topic_command.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 import wee_slack
 from wee_slack import parse_topic_command, topic_command_cb
 from mock import patch
diff --git a/_pytest/test_unfurl.py b/_pytest/test_unfurl.py
index 6b8e84c..c73abaa 100644
--- a/_pytest/test_unfurl.py
+++ b/_pytest/test_unfurl.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 import wee_slack
 import pytest
 
diff --git a/_pytest/test_unwrap_attachments.py b/_pytest/test_unwrap_attachments.py
index 0839613..89436af 100644
--- a/_pytest/test_unwrap_attachments.py
+++ b/_pytest/test_unwrap_attachments.py
@@ -1,3 +1,5 @@
+from __future__ import print_function, unicode_literals
+
 import wee_slack
 import pytest
 
diff --git a/_pytest/test_utf8_helpers.py b/_pytest/test_utf8_helpers.py
index 33c66ce..15340a5 100644
--- a/_pytest/test_utf8_helpers.py
+++ b/_pytest/test_utf8_helpers.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function, unicode_literals
+
 from collections import OrderedDict
 from wee_slack import decode_from_utf8, encode_to_utf8, utf8_decode
 
diff --git a/generate_docs.py b/generate_docs.py
index 491b316..d21d855 100755
--- a/generate_docs.py
+++ b/generate_docs.py
@@ -1,8 +1,8 @@
 #!/usr/bin/python2
 # -*- coding: utf-8 -*-
 
-from __future__ import print_function
-from __future__ import unicode_literals
+from __future__ import print_function, unicode_literals
+
 from textwrap import dedent
 import wee_slack