Merge branch 'master' into collabs

.gitignore

@@ -6,3 +6,5 @@
 .eggs/
 *.egg-info/
 .coverage
+.idea/
+venv/

.travis.yml

@@ -10,6 +10,7 @@ python:
   - "pypy-5.3.1"
 
 install:
+  - pip install -U setuptools
   - pip install -e .
   - pip install -r requirements-dev.txt
 

pirant/__init__.py

@@ -1 +1,2 @@
+from __future__ import absolute_import, division, print_function
 from .app import DevRant

pirant/app.py

@@ -1,7 +1,9 @@
+from __future__ import absolute_import, division, print_function
+from builtins import object
 from .handlers import RequestHandler, ResponseHandler
 
 
-class DevRant:
+class DevRant(object):
 
     def __init__(self):
         self.RequestHandler = RequestHandler()
@@ -29,4 +31,4 @@ def get_collabs(self, skip, limit):
 
     def get_collab_by_id(self, collab_id):
         response = self.RequestHandler.get_rant_by_id(collab_id)
-        return self.ResponseHandler.get_rant_by_id_build_response(response)
+        return self.ResponseHandler.get_rant_by_id_build_response(response)

pirant/handlers.py

@@ -1,10 +1,12 @@
+from __future__ import absolute_import, division, print_function
 import json
 import requests
+from builtins import object
 from .models import RantsResponse, RantResponse, SearchResponse
 from .urlbuilder import URLBuilder
 
 
-class ResponseHandler:
+class ResponseHandler(object):
 
     def __init__(self):
         self.RantsResponse = RantsResponse()
@@ -31,7 +33,7 @@ def get_collabs_build_response(self, response):
         deserialized = self.RantsResponse.deserialize(json_string)
         return deserialized
 
-class RequestHandler:
+class RequestHandler(object):
 
     def __init__(self):
         self.UrlBuilder = URLBuilder()
@@ -55,8 +57,8 @@ def search_rants_by_keyword(self, keyword):
         url = self.UrlBuilder.search_rants_by_keywords(keyword)
         response = requests.get(url)
         return response
-
+      
     def get_collabs(self, skip, sort):
         url = self.UrlBuilder.get_collabs_url(skip, sort)
         response = requests.get(url)
-        return response
+        return response

pirant/models.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import colander
 
 class News(colander.MappingSchema):
@@ -88,4 +89,4 @@ class RantResponse(colander.MappingSchema):
 class SearchResponse(colander.MappingSchema):
     success = colander.SchemaNode(colander.Boolean(), missing=colander.drop)
     error = colander.SchemaNode(colander.Boolean(), missing=colander.drop)
-    results = Rants()
+    results = Rants()

pirant/urlbuilder.py

@@ -1,4 +1,8 @@
-class URLBuilder:
+from __future__ import absolute_import, division, print_function
+from builtins import str
+from builtins import object
+
+class URLBuilder(object):
     def __init__(self):
         self.APP_VERSION = 3
         self.BASE_URL = "https://www.devrant.io/api/devrant"

pirant/utils.py

@@ -1,8 +1,11 @@
-class MockHttpResponse:
+from __future__ import absolute_import, division, print_function
+from builtins import object
+
+class MockHttpResponse(object):
     """
     Test Util: mocks response
     """
     # TODO Move this to helpers under tests directory
     def __init__(self, content, status_code):
         self.content = content
-        self.status_code = status_code
+        self.status_code = status_code

setup.py

@@ -18,6 +18,7 @@
     install_requires=[
         "colander",
         "requests",
+	"future",
     ],
     setup_requires=[
         "pytest-runner"

tests/test_app.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import unittest
 from pirant import DevRant
 from mock import patch

tests/test_handlers.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import unittest
 from mock import Mock, patch
 from pirant.handlers import RequestHandler, ResponseHandler
@@ -188,4 +189,4 @@ def test_successful_search_rants_by_keyword_build_response(self):
         mockResponse = MockHttpResponse(test_content, test_status_code)
         searchResults = self.responseHandler.search_rants_by_keyword_build_response(mockResponse)
         assert searchResults['results'][0]['id'] == 173
-        assert searchResults['success'] == True
+        assert searchResults['success'] == True

tests/test_model.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import unittest
 import colander
 import pirant.models

tests/test_urlbuilder.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import unittest
 
 from pirant.urlbuilder import URLBuilder

tests/test_utils.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import unittest
 from pirant.utils import MockHttpResponse