Skip to content

Commit

Permalink
Indicate non-coverage areas
Browse files Browse the repository at this point in the history
  • Loading branch information
macro1 committed Dec 20, 2014
1 parent 158ee65 commit c61aa7d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 17 deletions.
8 changes: 4 additions & 4 deletions simple_history/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
from django.utils.translation import ugettext as _
try:
from django.utils.encoding import force_text
except ImportError: # django 1.3 compatibility
except ImportError: # pragma: no cover, Django < 1.5
from django.utils.encoding import force_unicode as force_text
from django.conf import settings

try:
USER_NATURAL_KEY = settings.AUTH_USER_MODEL
except AttributeError:
except AttributeError: # pragma: no cover, Django < 1.5
USER_NATURAL_KEY = "auth.User"
USER_NATURAL_KEY = tuple(key.lower() for key in USER_NATURAL_KEY.split('.', 1))

Expand All @@ -35,7 +35,7 @@ def get_urls(self):
opts = self.model._meta
try:
info = opts.app_label, opts.model_name
except AttributeError:
except AttributeError: # pragma: no cover, Django < 1.7
info = opts.app_label, opts.module_name
history_urls = patterns(
"",
Expand Down Expand Up @@ -115,7 +115,7 @@ def history_form_view(self, request, object_id, version_id):

try:
model_name = original_opts.model_name
except AttributeError:
except AttributeError: # pragma: no cover, Django < 1.7
model_name = original_opts.module_name
url_triplet = self.admin_site.name, original_opts.app_label, model_name
context = {
Expand Down
2 changes: 1 addition & 1 deletion simple_history/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def __init__(self, model, instance=None):
def get_super_queryset(self):
try:
return super(HistoryManager, self).get_queryset()
except AttributeError:
except AttributeError: # pragma: no cover, Django < 1.6
return super(HistoryManager, self).get_query_set()

def get_queryset(self):
Expand Down
20 changes: 8 additions & 12 deletions simple_history/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import threading
import copy
try:
from django.apps import apps # Django >= 1.7
except ImportError:
from django.apps import apps
except ImportError: # pragma: no cover, Django < 1.7
apps = None
from django.db import models, router
from django.db.models import loading
Expand All @@ -17,19 +17,15 @@
from django.utils.encoding import python_2_unicode_compatible
try:
from django.utils.encoding import smart_text
except ImportError:
except ImportError: # pragma: no cover, Django < 1.5
from django.utils.encoding import smart_unicode as smart_text
try:
from django.utils.timezone import now
except ImportError:
from datetime import datetime
now = datetime.now
from django.utils.timezone import now
from django.utils.translation import string_concat
try:
from south.modelsinspector import add_introspection_rules
except ImportError:
except ImportError: # pragma: no cover, south not present
pass
else:
else: # pragma: no cover, south configuration for CustomForeignKeyField
add_introspection_rules(
[], ["^simple_history.models.CustomForeignKeyField"])
from .manager import HistoryDescriptor
Expand Down Expand Up @@ -100,7 +96,7 @@ def create_history_model(self, model):
# registered under different app
attrs['__module__'] = self.module
elif app_module != self.module:
if apps is None:
if apps is None: # pragma: no cover, Django < 1.7
# has meta options with app_label
app = loading.get_app(model._meta.app_label)
attrs['__module__'] = app.__name__ # full dotted name
Expand Down Expand Up @@ -154,7 +150,7 @@ def revert_url(self):
opts = model._meta
try:
app_label, model_name = opts.app_label, opts.model_name
except AttributeError:
except AttributeError: # pragma: no cover, Django < 1.7
app_label, model_name = opts.app_label, opts.module_name
return ('%s:%s_%s_simple_history' %
(admin.site.name, app_label, model_name),
Expand Down

0 comments on commit c61aa7d

Please sign in to comment.