From 836d85668e336a2c53423cf56dfa257ba6e49a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Ga=C5=82uszka?= <galuszkak@gmail.com>
Date: Mon, 29 Sep 2014 18:20:57 +0200
Subject: [PATCH] only 28 failing test on py3 :)

---
 .tx/config            | 24 ------------------------
 djadmin2/filters.py   |  9 ++-------
 requirements.txt      |  8 ++++++++
 requirements_test.txt |  3 +++
 tox.ini               | 17 ++++-------------
 5 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 .tx/config
 create mode 100644 requirements.txt
 create mode 100644 requirements_test.txt

diff --git a/.tx/config b/.tx/config
deleted file mode 100644
index 6992427..0000000
--- a/.tx/config
+++ /dev/null
@@ -1,24 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = sr@latin:sr_Latn
-
-[django-admin2.djadmin2po]
-file_filter = djadmin2/locale/<lang>/LC_MESSAGES/django.po
-source_file = djadmin2/locale/en/LC_MESSAGES/django.po
-source_lang = en_US
-type = PO
-minimum_perc = 80
-
-[django-admin2.example-app]
-file_filter = example/blog/locale/<lang>/LC_MESSAGES/django.po
-source_file = example/blog/locale/en/LC_MESSAGES/django.po
-source_lang = en_US
-type = PO
-minimum_perc = 50
-
-[django-admin2.example2-app]
-file_filter = example2/polls/locale/<lang>/LC_MESSAGES/django.po
-source_file = example2/polls/locale/en/LC_MESSAGES/django.po
-source_lang = en_US
-type = PO
-minimum_perc = 50
diff --git a/djadmin2/filters.py b/djadmin2/filters.py
index 69e440f..42ccf94 100644
--- a/djadmin2/filters.py
+++ b/djadmin2/filters.py
@@ -88,7 +88,7 @@ def build_list_filter(request, model_admin, queryset):
     filterset_dict = {}
     for field_filter in filters:
         filterset_dict[field_filter.name] = field_filter
-    fields = filterset_dict.keys()
+    fields = list(filterset_dict.keys())
     filterset_dict['Meta'] = type(
         type_str('Meta'),
         (),
@@ -97,12 +97,7 @@ def build_list_filter(request, model_admin, queryset):
             'fields': fields,
         },
     )
-
-    return type(
-        type_str('%sFilterSet' % queryset.model.__name__),
-        (django_filters.FilterSet, ),
-        filterset_dict,
-    )(request.GET, queryset=queryset)
+    return type(type_str('%sFilterSet' % queryset.model.__name__),(django_filters.FilterSet, ),filterset_dict,)(request.GET, queryset=queryset)
 
 
 def build_date_filter(request, model_admin, queryset):
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..f98d2a6
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,8 @@
+django-extra-views>=0.6.5
+django-braces>=1.3.0
+djangorestframework>=2.3.3
+django-floppyforms>=1.1
+django-filter>=0.7
+django-crispy-forms>=1.3.2
+django-debug-toolbar>=0.9.4
+pytz==2014.7
\ No newline at end of file
diff --git a/requirements_test.txt b/requirements_test.txt
new file mode 100644
index 0000000..52a3f23
--- /dev/null
+++ b/requirements_test.txt
@@ -0,0 +1,3 @@
+-rrequirements.txt
+pytest
+pytest-django
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 815c5eb..1baeb33 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,20 +5,11 @@ envlist = py27-dj1.6.x, py27-dj1.7.x, py33-dj1.6.x, py34-dj1.6.x,
 skipsdist = True
 
 [testenv]
-commands = python setup.py test
-deps =
-     django-extra-views>=0.6.5
-     django-braces>=1.3.0
-     djangorestframework>=2.3.3
-     django-floppyforms>=1.1
-     django-filter>=0.7
-     django-crispy-forms>=1.3.2
-     django-debug-toolbar>=0.9.4
-     pytest
-     pytest-django
+commands = py.test []
+deps = -rrequirements_test.txt
 setenv=
-    DJANGO_SETTINGS_MODULE=example.settings
-    PYTHONPATH={toxinidir}
+    DJANGO_SETTINGS_MODULE = example.settings
+    PYTHONPATH = {toxinidir}/example
 
 [testenv:py27-dj1.6.x]
 basepython=python2.7