Merge pull request #3 from edx/ned/update-django-18

Minor cleanups for Django 1.8

djpyfs/models.py

@@ -55,21 +55,13 @@ class FSExpirations(models.Model):
         return cls.objects.filter(expires=True, expiration__lte = expiration_lte)
 
     class Meta:
+        app_label = 'djpyfs'
         unique_together = (("module","filename"))
-        ## FIXME: We'd like to create an index first on expiration than on expires (so we can 
-        ## search for objects where expires=True and expiration is before now). Django 1.5 
-        ## supports this, but 1.4 does not. 
-        ## 
-        ## I'm putting this in in preparation for 1.5. This is
-        ## slightly redundant, since documentation is unclear about
-        ## order of the joint index.
-        ##
-        ## When 1.5 comes out, we can drop the index on expiration. 
-        if django.get_version()>='1.5':
-            index_together = [
-                ["expires","expiration"], 
-                ["expiration","expires"]
-                ]
+        # We'd like to create an index first on expiration than on expires (so we can
+        # search for objects where expires=True and expiration is before now).
+        index_together = [
+            ["expiration", "expires"],
+            ]
 
     def __str__(self):
         if self.expires: 

djpyfs/tests.py

-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)

djpyfs/views.py

-# Create your views here.

setup.py

@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name='django-pyfs',
-      version='1.0',
+      version='1.0.3',
       description='Django pyfilesystem integration',
       author='Piotr Mitros',
       author_email='pmitros@edx.org',