From 4853b77c26b24cf004d56d184db578862946b7ae Mon Sep 17 00:00:00 2001
From: Marcos Pereira <marcos.pereira@agriness.com>
Date: Tue, 15 Aug 2017 10:13:50 -0300
Subject: [PATCH] Updated travis.

---
 .travis.yml            |  6 +++---
 README.md              | 31 +++++++++++++++++++++++++++++++
 keycloak/connection.py |  5 ++++-
 3 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 README.md

diff --git a/.travis.yml b/.travis.yml
index 1c3b4b6..18d1e36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: python
 python:
-  - "3.5"
+  - "3.6"
   - "pypy"
 install:
-  - pip install -r requirements.txt
+  - pip3 install -r requirements.txt
 script: 
-    python -m unittest discover
+    python3 -m unittest discover
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2fa4392
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+[![Build Status](https://travis-ci.org/marcospereirampj/python-keycloak.svg?branch=master)](https://travis-ci.org/marcospereirampj/python-keycloak)
+[![Documentation Status](https://readthedocs.org/projects/python-toggl/badge/?version=latest)](http://python-toggl.readthedocs.org/en/latest/?badge=latest)
+
+Python Keycloak
+====================
+
+**python-keycloak** is a Python package providing access to the Keycloak API.
+
+## Installation ##
+
+### Requirements ###
+
+python-keycloak depends on:
+
+* [requests](http://docs.python-requests.org/en/master/)
+* [httmock](https://github.com/patrys/httmock)
+
+### Install  ###
+
+```bash
+  python setup.py install
+```
+
+## Bug reports ##
+
+Please report bugs and feature requests at
+https://github.com/marcospereirampj/python-keycloak/issues
+
+## Documentation ##
+
+The documentation for python-keycloak is available on [readthedocs](http://python-toggl.readthedocs.org/en/latest/).
\ No newline at end of file
diff --git a/keycloak/connection.py b/keycloak/connection.py
index 322b3dc..77c2959 100644
--- a/keycloak/connection.py
+++ b/keycloak/connection.py
@@ -15,8 +15,11 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
 
-from urllib.parse import urljoin
 from .exceptions import *
 import requests