Merge pull request #1 from pkatseas/python3

Python3

.travis.yml

@@ -1,8 +1,12 @@
 language: python
 python:
     - "2.7"
+    - "3.2"
+    - "3.3"
+    - "3.4"
+    - "3.5"
 install:
     - "pip install -r requirements.pip"
     - "pip install coveralls"
-script: nosetests --with-coverage --cover-package=pyretry
-after_success: coveralls
+script: nose2 --with-coverage --coverage=pyretry
+after_success: coveralls

pyretry/__init__.py

@@ -1 +1 @@
-from pyretry import retry
+from .pyretry import retry  # noqa

pyretry/pyretry.py

@@ -1,13 +1,15 @@
-from functools import wraps
 import time
 
+from functools import wraps
+
+
 def retry(exceptions_to_catch, num_retries=5, timeout=0, hook=None):
     def decorator(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
             timeout_is_func = hasattr(timeout, '__call__')
 
-            for i in xrange(num_retries + 1):
+            for i in range(num_retries + 1):
                 attempt_number = i + 1
 
                 try:

pyretry/tests.py

@@ -1,17 +1,22 @@
 import unittest
+
 import mock
 
-from pyretry import retry
+from .pyretry import retry
+
 
 class RetryableError(Exception):
     pass
 
+
 class DifferentRetryableError(Exception):
     pass
 
+
 class UnretryableError(Exception):
     pass
 
+
 class TestPyretry(unittest.TestCase):
 
     def setUp(self):
@@ -106,7 +111,7 @@ def always_fails():
         self.assertRaises(RetryableError, always_fails)
         self.assertEqual(self.counter, 6)
 
-        expected = [mock.call(i + 1) for i in xrange(5)]
+        expected = [mock.call(i + 1) for i in range(5)]
         self.assertEqual(timeout_calc.call_args_list, expected)
 
     def test_hook_is_called(self):

requirements.pip

@@ -1,3 +1,2 @@
 mock==1.0.1
-nose==1.3.0
-wsgiref==0.1.2
+nose2[coverage-plugin]==0.6.5

setup.py

@@ -1,9 +1,10 @@
-from distutils.core import setup
+from setuptools import setup
+
 
 setup(
     name='pyretry',
     version="0.9",
-    description='Separate your retry logic from your buxiness lgic',
+    description='Separate your retry logic from your business logic',
     author='Bob Renwick',
     author_email='bob.renwick@gmail.com',
     url='https://github.com/bobbyrenwick/pyretry',
@@ -15,5 +16,6 @@
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
     ),
-)
+)