diff options
Diffstat (limited to 'presentty/server.py')
-rw-r--r-- | presentty/server.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/presentty/server.py b/presentty/server.py index 74e64b2..ad4c441 100644 --- a/presentty/server.py +++ b/presentty/server.py @@ -13,11 +13,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +from __future__ import absolute_import, division, print_function + import os import threading -import SocketServer -class ConsoleHandler(SocketServer.StreamRequestHandler): +import six.moves.socketserver + +class ConsoleHandler(six.moves.socketserver.StreamRequestHandler): def handle(self): server = self.server.server while True: @@ -38,6 +41,7 @@ class ConsoleHandler(SocketServer.StreamRequestHandler): i, slide.progressive_state, slide.title)) elif data == 'next': i, slide = server.next() + #i, slide = next(server) self.wfile.write('current %i %i %s\n' % ( i, slide.progressive_state, slide.title)) elif data == 'prev': @@ -53,7 +57,7 @@ class ConsoleHandler(SocketServer.StreamRequestHandler): size = server.size() self.wfile.write('size %s %s\n' % size) -class ThreadedTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): +class ThreadedTCPServer(six.moves.socketserver.ThreadingMixIn, six.moves.socketserver.TCPServer): allow_reuse_address=True class ConsoleServer(object): |