From 8af3d5db492c7468a1f2e4befdcd78b59216241d Mon Sep 17 00:00:00 2001
From: José Padilla
Date: Tue, 28 Oct 2014 16:58:25 -0400
Subject: Use PYTHONDONTWRITEBYTECODE=1 on tox environment

This fixes bad marshal data errors after running
tests with tox and later running tests manually
via runtests.py. Fixes #1957---
 tox.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tox.ini b/tox.ini
index d40a7079..b3f53cce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,8 @@ envlist =
 
 [testenv]
 commands = ./runtests.py --fast
+setenv =
+       PYTHONDONTWRITEBYTECODE=1
 
 [testenv:flake8]
 basepython = python2.7
-- 
cgit v1.2.3


From f25f05dde58908ca6885c88499e4d5984f0f3502 Mon Sep 17 00:00:00 2001
From: Andrew Conti
Date: Wed, 29 Oct 2014 16:31:36 -0400
Subject: Update authentication.md

Based on the [new documentation](https://docs.djangoproject.com/en/dev/topics/auth/customizing/#django.contrib.auth.get_user_model) for Django 1.7 we should now use:

```python
@receiver(post_save, sender=settings.AUTH_USER_MODEL)
```
instead of:

```python 
@receiver(post_save, sender=get_user_model())
```
because `get_user_model()` only works once Django has imported all models. Otherwise you'll get: 

```python
django.core.exceptions.AppRegistryNotReady: Models aren't loaded yet.
```
When trying to start your sever after adding token authentication.

From the Docs, ( linked above as well ) :
>New in Django 1.7:
>When connecting to signals sent by the User model, you should specify the custom model using the AUTH_USER_MODEL setting.---
 docs/api-guide/authentication.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/api-guide/authentication.md b/docs/api-guide/authentication.md
index b355012e..3a5156fd 100755
--- a/docs/api-guide/authentication.md
+++ b/docs/api-guide/authentication.md
@@ -168,12 +168,13 @@ The `curl` command line tool may be useful for testing token authenticated APIs.
 
 If you want every user to have an automatically generated Token, you can simply catch the User's `post_save` signal.
 
+    from django.conf import settings
     from django.contrib.auth import get_user_model
     from django.db.models.signals import post_save
     from django.dispatch import receiver
     from rest_framework.authtoken.models import Token
 
-    @receiver(post_save, sender=get_user_model())
+    @receiver(post_save, sender=settings.AUTH_USER_MODEL)
     def create_auth_token(sender, instance=None, created=False, **kwargs):
         if created:
             Token.objects.create(user=instance)
-- 
cgit v1.2.3