From 08a9683ae1038c3b6b389f605da8e0a2131f149a Mon Sep 17 00:00:00 2001
From: Dirk Eschler <eschler@gmail.com>
Date: Thu, 1 Nov 2012 20:05:17 +0100
Subject: [PATCH] Switched to flake8 in favour of pep8 and pyflakes which
 allows to ignore certain statements.

---
 .travis.yml                    | 6 ++----
 modeltranslation/admin.py      | 3 +--
 modeltranslation/tests/urls.py | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d682a63..719215f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,16 +22,14 @@ matrix:
     - python: "2.5"
       env: DJANGO=https://github.com/django/django/zipball/master DB=mysql
 before_script:
-  - pep8 modeltranslation
-  - pyflakes modeltranslation
+  - flake8 modeltranslation
   - mysql -e 'create database modeltranslation;'
   - psql -c 'create database modeltranslation;' -U postgres
 install:
   - pip install -q mysql-python --use-mirrors
   - pip install -q psycopg2 --use-mirrors
   - pip install -q Pillow --use-mirrors
-  - pip install -q pep8 --use-mirrors
-  - pip install -q pyflakes --use-mirrors
+  - pip install -q flake8 --use-mirrors
   - pip install -q $DJANGO
   - pip install -e . --use-mirrors
 script:
diff --git a/modeltranslation/admin.py b/modeltranslation/admin.py
index 5997257..a17f2c5 100644
--- a/modeltranslation/admin.py
+++ b/modeltranslation/admin.py
@@ -9,8 +9,7 @@ from django.utils import translation
 # Ensure that models are registered for translation before TranslationAdmin
 # runs. The import is supposed to resolve a race condition between model import
 # and translation registration in production (see issue #19).
-import modeltranslation.models
-assert modeltranslation.models  # silence pyflakes
+import modeltranslation.models  # NOQA
 from modeltranslation.settings import DEFAULT_LANGUAGE
 from modeltranslation.translator import translator
 from modeltranslation.utils import (get_translation_fields,
diff --git a/modeltranslation/tests/urls.py b/modeltranslation/tests/urls.py
index 3b7e7bc..653df6d 100644
--- a/modeltranslation/tests/urls.py
+++ b/modeltranslation/tests/urls.py
@@ -3,7 +3,7 @@ try:
     from django.conf.urls import include, patterns, url
     assert (include, patterns, url)  # Workaround for pyflakes issue #13
 except ImportError:  # Django 1.3 fallback
-    from django.conf.urls.defaults import include, patterns, url
+    from django.conf.urls.defaults import include, patterns, url  # NOQA
 from django.contrib import admin