Cleanup
This commit is contained in:
parent
c3de277f07
commit
66aa775324
3 changed files with 8 additions and 7 deletions
|
@ -91,7 +91,7 @@ if 'test' in sys.argv or len(sys.argv) == 1:
|
|||
HELPER_SETTINGS['INSTALLED_APPS'].append('django_nose')
|
||||
|
||||
try:
|
||||
import admin_enhancer
|
||||
import admin_enhancer # pragma: no cover # NOQA
|
||||
HELPER_SETTINGS['INSTALLED_APPS'].append('admin_enhancer')
|
||||
except ImportError:
|
||||
pass
|
||||
|
|
|
@ -1,11 +1,6 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from copy import deepcopy
|
||||
|
||||
try:
|
||||
from admin_enhancer.admin import EnhancedModelAdminMixin
|
||||
except ImportError:
|
||||
class EnhancedModelAdminMixin(object):
|
||||
pass
|
||||
from cms.admin.placeholderadmin import FrontendEditableAdminMixin, PlaceholderAdminMixin
|
||||
from django import forms
|
||||
from django.conf import settings
|
||||
|
@ -16,6 +11,12 @@ from parler.admin import TranslatableAdmin
|
|||
from .models import BlogCategory, Post
|
||||
from .settings import get_setting
|
||||
|
||||
try:
|
||||
from admin_enhancer.admin import EnhancedModelAdminMixin
|
||||
except ImportError:
|
||||
class EnhancedModelAdminMixin(object):
|
||||
pass
|
||||
|
||||
|
||||
class BlogCategoryAdmin(EnhancedModelAdminMixin, TranslatableAdmin):
|
||||
def get_prepopulated_fields(self, request, obj=None):
|
||||
|
|
2
tox.ini
2
tox.ini
|
@ -1,5 +1,5 @@
|
|||
[tox]
|
||||
envlist = py{26}-django{16}-cms{30,31,32},py{27,33,34}-django{16,17,18}-cms{30,31,32},isort,pep8
|
||||
envlist = py{26}-django16-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31,32},py{27,33,34}-django{18}-cms{31,32},pep8,isort
|
||||
|
||||
[testenv]
|
||||
commands = {env:COMMAND:python} setup.py test
|
||||
|
|
Loading…
Add table
Reference in a new issue