some tests and pep8

Author: saxix

setup.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-import os
-import codecs
-from distutils.config import PyPIRCCommand
 from setuptools import setup, find_packages
 
 dirname = 'whatsnew'

whatsnew/fields.py

@@ -1,73 +1,10 @@
 # -*- coding: utf-8 -*-
 from django.core import exceptions
 from django.db import models
-from types import StringTypes
 from django.utils.translation import gettext as _
-import pkg_resources
+from .version import Version
 
 
-class Version(object):
-    def __init__(self, vstring):
-        self._components = pkg_resources.parse_version(vstring)
-        self.string = vstring
-        self._patch = []
-        for i, part in enumerate(self._components):
-            if '*' in part:
-                break
-        if len(self._components) > i:
-            self._patch = map(lambda x: x.replace('*', ''), self._components[i + 1:-1])
-        parts = list(self._components[:i])
-        parts.extend('0' * (3 - len(parts)))
-
-        self._parts = map(int, parts)
-
-        self._status = self._components[i][1]
-
-    def same(self, other):
-        return self._parts == other._parts
-
-    def __str__(self):
-        return self.string
-
-    def __repr__(self):
-        return "Version ('%s')" % str(self)
-
-    def __unicode__(self):
-        return unicode(str(self))
-
-    def __cmp__(self, other):
-        if isinstance(other, StringTypes):
-            other = Version(other)
-        if not other:
-            return None
-        return cmp(self._components, other._components)
-
-    @property
-    def major(self):
-        return self._parts[0]
-
-    @property
-    def minor(self):
-        return self._parts[1]
-
-    @property
-    def release(self):
-        return self._parts[2]
-
-    @property
-    def patch(self):
-        return ".".join(self._patch)
-
-    @property
-    def status(self):
-        if self._status == '@':
-            return "nighlybuild"
-        return self._status
-
-    @property
-    def version(self):
-        return self._parts + [self.status] + [self.patch]
-
 class VersionField(models.CharField):
     __metaclass__ = models.SubfieldBase
     default_error_messages = {
@@ -114,22 +51,17 @@ def validate(self, value, model_instance):
             raise exceptions.ValidationError(self.error_messages['invalid'], code='invalid')
 
 
-
 def add_south_rules():
     from south.modelsinspector import add_introspection_rules
 
-    add_introspection_rules([
-        (
-            (VersionField,),
-            [],
-            {},
-        ),
-    ], ["whatsnew\.fields"])
+    add_introspection_rules([((VersionField,),
+                              [],
+                              {},), ], ["whatsnew\.fields"])
 
 
 try:  # pragma: no cover
     import south
-except ImportError: # pragma: no cover
+except ImportError:  # pragma: no cover
     south = None
 
 if south:  # pragma: no cover

whatsnew/templatetags/__init__.py

@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.utils.translation import gettext as _

whatsnew/templatetags/whatsnew.py

@@ -1,32 +1,29 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from django.template import Library
-from types import StringTypes
 import datetime
+from django.template import Library
 from whatsnew.models import WhatsNew
 from django.db.models import Q
 from whatsnew.fields import Version
-from whatsnew.util import get_version
+# from whatsnew.util import get_version
 
 
 register = Library()
 
 
 @register.inclusion_tag('whatsnew/whatsnew.html', takes_context=True)
-def whatsnew(context, package_name, force=1):
+def whatsnew(context, package_name, force=0):
     request = context['request']
     cookie_name = "{}-whatsnew".format(package_name)
     ctx = {'name': cookie_name}
     today = datetime.datetime.today()
-    last = None
 
-    last_seen = Version(request.COOKIES.get(cookie_name) or '0.0')
-    current_version = Version(get_version(package_name))
     try:
         last = WhatsNew.objects.filter(enabled=True).filter(Q(expire__gte=today) | Q(expire=None)).latest()
+        last_seen = Version(request.COOKIES.get(cookie_name) or '0.0')
         ctx.update({'content': last.content,
                     'version': last.version,
-                    'display': (last.version != last_seen) or force})
+                    'display': (last.version > last_seen) or force})
     except WhatsNew.DoesNotExist:
         ctx.update({'content': None, 'version': None, 'display': force})
 

whatsnew/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
 from django.views.generic import TemplateView
 
 
@@ -7,5 +7,3 @@
     url(r'^test/', TemplateView.as_view(template_name='whatsnew/test.html'), name='whatsnew-test'),
     # url(r'^latest/$', 'latest', name='whatsnew-latest'),
 )
-
-

whatsnew/util.py

@@ -23,4 +23,3 @@ def get_version(package_name):
         return str(version)
     else:
         raise pkg_resources.DistributionNotFound
-

whatsnew/views.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.http import HttpResponse