Skip to content

Commit 36c9102

Browse files
committed
pep8 on demo app
1 parent b1d1e07 commit 36c9102

File tree

5 files changed

+15
-19
lines changed

5 files changed

+15
-19
lines changed

demo/demoproject/demoapp/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class ImportExportDemoModelAdmin(ImportExportMixin, ConcurrentModelAdmin):
2323
except:
2424
pass
2525

26+
2627
def register(site):
2728
site.register(DemoModel, DemoModelAdmin)
2829
site.register(proxy_factory("ImportExport"), ImportExportDemoModelAdmin)

demo/demoproject/demoapp/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ class DemoModel(models.Model):
1010
class Meta:
1111
app_label = 'demoapp'
1212

13-
class ProxyDemoModel(DemoModel):
1413

14+
class ProxyDemoModel(DemoModel):
1515
class Meta:
1616
app_label = 'demoapp'
1717
proxy = True
1818

19+
1920
def proxy_factory(name):
20-
return type(name, (ProxyDemoModel,), {'__module__':ProxyDemoModel.__module__,
21-
'Meta': type('Meta', (object,), {'proxy': True, 'app_label': 'demoapp'}, )
22-
})
21+
return type(name, (ProxyDemoModel,), {'__module__': ProxyDemoModel.__module__,
22+
'Meta': type('Meta', (object,), {'proxy': True, 'app_label': 'demoapp'})})

demo/demoproject/demoapp/tests.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
from demoproject.demoapp.models import DemoModel
1111

1212
try:
13-
from import_export.admin import ImportExportMixin
13+
from import_export.admin import ImportExportMixin # NOQA
1414
import csv
1515

1616
class TestAdminEdit(WebTest):
1717

1818
def setUp(self):
1919
self.user = User.objects.get_or_create(is_superuser=True,
20-
is_staff=True,
21-
is_active=True,
22-
email='sax@example.com',
23-
username='sax')
20+
is_staff=True,
21+
is_active=True,
22+
email='sax@example.com',
23+
username='sax')
2424

2525
def test_export_csv(self):
2626
url = reverse('admin:demoapp_importexport_changelist')
@@ -58,7 +58,5 @@ def test_import_csv_with_version(self):
5858
res = res.form.submit()
5959
res = res.form.submit()
6060

61-
62-
6361
except:
6462
pass

demo/demoproject/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# CONCURRENCY_POLICY = 2
3030

3131
try:
32-
import import_export
32+
import import_export # NOQA
3333

3434
INSTALLED_APPS.append('import_export')
3535
except ImportError:

demo/demoproject/urls.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
from django.conf.urls import patterns, include
22
# from django.contrib.admin import ModelAdmin
33
from django.contrib import admin
4-
from django.contrib import admin
54
from django.contrib.auth.models import User, Group
6-
import demoproject.demoapp.admin
75
from demoproject.demoapp.admin import DemoModelAdmin, ImportExportDemoModelAdmin
86
from demoproject.demoapp.models import DemoModel, proxy_factory
97

@@ -15,18 +13,17 @@ def has_permission(self, request):
1513
request.user = User.objects.get_or_create(username='sax')[0]
1614
return True
1715

16+
1817
public_site = PublicAdminSite()
1918
admin.autodiscover()
2019
public_site.register([User, Group])
21-
for e,v in admin.site._registry.items():
22-
public_site._registry[e] = v
2320

24-
# demoproject.demoapp.admin.site = public_site
21+
for e, v in admin.site._registry.items():
22+
public_site._registry[e] = v
2523

2624
public_site.register(DemoModel, DemoModelAdmin)
2725
public_site.register(proxy_factory("ImportExport"), ImportExportDemoModelAdmin)
2826

2927
urlpatterns = patterns('',
3028
(r'^admin/', include(include(public_site.urls))),
31-
(r'', include(include(public_site.urls))),
32-
)
29+
(r'', include(include(public_site.urls))))

0 commit comments

Comments
 (0)