Skip to content

Commit

Permalink
Merge pull request #98 from vintasoftware/py35
Browse files Browse the repository at this point in the history
Adding support to python 3.5
  • Loading branch information
filipeximenes committed Dec 20, 2015
2 parents 5599892 + e274d49 commit d5746ea
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ install:
- pip install tox
script:
- tox
python:
- 3.5
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ def get_version(package):
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.1',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
],
test_suite='tests',
tests_require=test_requirements
Expand Down
2 changes: 2 additions & 0 deletions tapioca/adapters.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ def is_authentication_expired(self, exception=None, *args, **kwargs):
def refresh_authentication(self, *args, **kwargs):
raise NotImplementedError()


class FormAdapterMixin(object):

def format_data_to_request(self, data):
Expand All @@ -95,6 +96,7 @@ def format_data_to_request(self, data):
def response_to_native(self, response):
return {'text': response.text}


class JSONAdapterMixin(object):

def get_request_kwargs(self, api_params, *args, **kwargs):
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{27,32,33,34},coverage
py{27,32,33,34,35},coverage

[testenv]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
Expand All @@ -9,6 +9,7 @@ basepython =
py32: python3.2
py33: python3.3
py34: python3.4
py35: python3.5
deps =
mock
requests
Expand Down

0 comments on commit d5746ea

Please sign in to comment.