Merge pull request #2 from ByteInternet/python3

Python3 compatibility

Author: Bono de Visser

runtests.py

@@ -1,9 +1,9 @@
 from varnishadm import VarnishManager
 import unittest
 
-ADDR = raw_input('Varnish Management Address (ip:port) [localhost:2000]: ')
+ADDR = input('Varnish Management Address (ip:port) [localhost:2000]: ')
 if not ADDR: ADDR = 'localhost:2000'
-WEB_ADDR = raw_input('Varnish Instance Address (ip:port) [localhost:8080]: ')
+WEB_ADDR = input('Varnish Instance Address (ip:port) [localhost:8080]: ')
 if not WEB_ADDR: WEB_ADDR = 'localhost:8080'
 
 class VarnishTests(unittest.TestCase):
@@ -13,7 +13,7 @@ def setUp(self):
     def test_ping(self):
         result = self.manager.run('ping')[0][0]
         self.assertEqual(len(result), 2)
-        self.assert_(map(lambda x: isinstance(x, float), (True,True)))
+        self.assertTrue([isinstance(x, float) for x in (True,True)])
 
     def test_purge(self):
         resp = self.manager.run(
@@ -23,7 +23,7 @@ def test_purge(self):
     def test_ban(self):
         regex = '^/banned/*'
         self.manager.run('ban.url', regex)
-        self.assert_(regex, str(self.manager.run('ban.list')))
+        self.assertTrue(regex, str(self.manager.run('ban.list')))
 
     def test_multiple(self):
         result = self.manager.run(( ('ping',None),('ping',None) ))

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='python-varnishadm',
-    version='0.2.2',
+    version='1.0.0',
     long_description=open('README.rst').read(),
     description='Simple Python interface for the Varnish management port',
     author='Justin Quick',

varnishadm.py

@@ -33,8 +33,8 @@
 """
 from telnetlib import Telnet
 from threading import Thread
-from httplib import HTTPConnection
-from urlparse import urlparse
+from http.client import HTTPConnection
+from urllib.parse import urlparse
 from hashlib import sha256
 import logging
 
@@ -64,7 +64,7 @@ def http_purge_url(url):
 
 class VarnishHandler(Telnet):
     def __init__(self, host_port_timeout, secret=None, **kwargs):
-        if isinstance(host_port_timeout, basestring):
+        if isinstance(host_port_timeout, str):
             host_port_timeout = host_port_timeout.split(':')
         Telnet.__init__(self, *host_port_timeout)
         (status, length), content = self._read()
@@ -74,7 +74,7 @@ def __init__(self, host_port_timeout, secret=None, **kwargs):
             logging.error('Connecting failed with status: %i' % status)
 
     def _read(self):
-        (status, length), content = map(int, self.read_until('\n').split()), ''
+        (status, length), content = list(map(int, self.read_until('\n').split())), ''
         while len(content) < length:
             content += self.read_some()
         return (status, length), content[:-1]
@@ -90,7 +90,7 @@ def fetch(self, command):
             buffer = self.read_until('\n').strip()
             if len(buffer):
                 break
-        status, length = map(int, buffer.split())
+        status, length = list(map(int, buffer.split()))
         content = ''
 
         if status != 200: