Merge pull request #1780 from tomchristie/pytest-tweaks

Added `runtests.py` and `flake8` code linting.

2 files changed, 1 insertions, 9 deletions

diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py
index 167fa531..db21d44c 100644
--- a/rest_framework/authtoken/models.py
+++ b/rest_framework/authtoken/models.py
@@ -1,6 +1,5 @@
 import binascii
 import os
-from hashlib import sha1
 from django.conf import settings
 from django.db import models
 
diff --git a/rest_framework/authtoken/south_migrations/0001_initial.py b/rest_framework/authtoken/south_migrations/0001_initial.py
index d5965e40..926de02b 100644
--- a/rest_framework/authtoken/south_migrations/0001_initial.py
+++ b/rest_framework/authtoken/south_migrations/0001_initial.py
@@ -1,15 +1,10 @@
 # -*- coding: utf-8 -*-
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
-
-from rest_framework.settings import api_settings
-
 
 try:
     from django.contrib.auth import get_user_model
-except ImportError: # django < 1.5
+except ImportError:  # django < 1.5
     from django.contrib.auth.models import User
 else:
     User = get_user_model()
@@ -26,12 +21,10 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('authtoken', ['Token'])
 
-
     def backwards(self, orm):
         # Deleting model 'Token'
         db.delete_table('authtoken_token')
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},