Merge pull request #75 from rollbar/bugfix/invalid-utf8-during-encoding

Bugfix/invalid utf8 during encoding

.travis.yml

@@ -1,32 +1,34 @@
 sudo: false
 language: python
-
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-
-env:
-  - FLASK_VERSION=0.9
-  - FLASK_VERSION=0.10.1
-  - TWISTED_VERSION=15.4
-
 matrix:
-  exclude:
-    - python: "3.2"
+  include:
+    - python: "2.6"
       env: FLASK_VERSION=0.9
-    - python: "3.2"
+    - python: "2.7"
+      env: FLASK_VERSION=0.10.1
+    - python: "3.3"
+      env: FLASK_VERSION=0.10.1
+    - python: "3.4"
+      env: FLASK_VERSION=0.10.1
+
+    - python: "2.7"
       env: TWISTED_VERSION=15.4
+
+    - python: "2.6"
+      env: DJANGO_VERSION=1.4
+    - python: "2.7"
+      env: DJANGO_VERSION=1.4
+    - python: "3.2"
+      env: DJANGO_VERSION=1.7
     - python: "3.3"
-      env: FLASK_VERSION=0.9
+      env: DJANGO_VERSION=1.8
     - python: "3.4"
-      env: FLASK_VERSION=0.9
+      env: DJANGO_VERSION=1.8
 
 install:
   - if [ -v FLASK_VERSION ]; then pip install Flask==$FLASK_VERSION; fi
   - if [ -v TWISTED_VERSION ]; then pip install Twisted==$TWISTED_VERSION service_identity pyOpenSSL; fi
+  - if [ -v DJANGO_VERSION ]; then pip install Django==$DJANGO_VERSION; fi
 
 script:
   - python setup.py test

README.md

@@ -59,6 +59,8 @@ ROLLBAR = {
 <!-- RemoveNextIfProject -->
 Be sure to replace ```POST_SERVER_ITEM_ACCESS_TOKEN``` with your project's ```post_server_item``` access token, which you can find in the Rollbar.com interface.
 
+Check out the [Django example](https://github.com/rollbar/pyrollbar/tree/master/rollbar/examples/django).
+
 ### Pyramid
 
 In your ``ini`` file (e.g. ``production.ini``), add ``rollbar.contrib.pyramid`` to the end of your ``pyramid.includes``:

requirements.txt

@@ -1 +1,2 @@
 requests>=0.12.1
+six==1.9.0