Fixed functional tests code after py3k support

.gitignore

@@ -9,3 +9,4 @@ slackbot_settings.py
 /build
 /dist
 /*.egg-info
+.cache

pytest.ini

@@ -1,2 +1,2 @@
 [pytest]
-addopts = -s -v --doctest-modules --ignore=build --ignore=dist --ignore=slackbot.egg-info --ignore=setup.py
+addopts = -s -v --ignore=build --ignore=dist --ignore=slackbot.egg-info --ignore=setup.py

slackbot/slackclient.py

@@ -1,11 +1,12 @@
-# -*- coding: utf8 -*-
+#coding: UTF-8
 
 from __future__ import print_function, absolute_import
 import os
 import json
 import logging
 import time
 import slacker
+from six import iteritems
 
 from websocket import (
     create_connection, WebSocketException, WebSocketConnectionClosedException
@@ -124,7 +125,7 @@ def get_channel(self, channel_id):
         return Channel(self, self.channels[channel_id])
 
     def find_user_by_name(self, username):
-        for userid, user in self.users.iteritems():
+        for userid, user in iteritems(self.users):
             if user['name'] == username:
                 return userid
 

tests/functional/driver.py

@@ -1,10 +1,10 @@
-import thread
 import threading
 import json
 import re
 import time
 import slacker
 import websocket
+from six.moves import _thread, range
 
 
 class Driver(object):
@@ -44,7 +44,7 @@ def wait_for_bot_offline(self):
         self._wait_for_bot_presense(False)
 
     def _wait_for_bot_presense(self, online):
-        for _ in xrange(10):
+        for _ in range(10):
             time.sleep(2)
             if online and self._is_testbot_online():
                 break
@@ -92,7 +92,7 @@ def ensure_only_specificmessage_from_bot(self, match, wait=5, tosender=False):
         else:
             match = r'^%s$' % match
 
-        for _ in xrange(wait):
+        for _ in range(wait):
             time.sleep(1)
             with self._events_lock:
                 for event in self.events:
@@ -101,7 +101,7 @@ def ensure_only_specificmessage_from_bot(self, match, wait=5, tosender=False):
                             'expected to get message matching "%s", but got message "%s"' % (match, event['text']))
 
     def ensure_no_channel_reply_from_bot(self, wait=5):
-        for _ in xrange(wait):
+        for _ in range(wait):
             time.sleep(1)
             with self._events_lock:
                 for event in self.events:
@@ -110,7 +110,7 @@ def ensure_no_channel_reply_from_bot(self, wait=5):
                             'expected to get nothing, but got message "%s"' % event['text'])
 
     def wait_for_file_uploaded(self, name, maxwait=60):
-        for _ in xrange(maxwait):
+        for _ in range(maxwait):
             time.sleep(1)
             if self._has_uploaded_file_rtm(name):
                 break
@@ -122,7 +122,7 @@ def _send_message_to_bot(self, channel, msg):
         self.slacker.chat.post_message(channel, msg, username=self.driver_username)
 
     def _wait_for_bot_message(self, channel, match, maxwait=60, tosender=True):
-        for _ in xrange(maxwait):
+        for _ in range(maxwait):
             time.sleep(1)
             if self._has_got_message_rtm(channel, match, tosender):
                 break
@@ -169,7 +169,7 @@ def _rtm_connect(self):
 
         self._websocket = websocket.create_connection(r['url'])
         self._websocket.sock.setblocking(0)
-        thread.start_new_thread(self._rtm_read_forever, tuple())
+        _thread.start_new_thread(self._rtm_read_forever, tuple())
 
     def _websocket_safe_read(self):
         """Returns data if available, otherwise ''. Newlines indicate multiple messages """