Commits

Luke Plant  committed 617e00d

Fixed up references for new reorganisation of files

  • Participants
  • Parent commits cb1a623

Comments (0)

Files changed (6)

File django/validator/middleware.py

-from lukeplant_me_uk.django.apps.validator.models import ValidationFailure
+from lukeplant_me_uk.django.validator.models import ValidationFailure
 
 class ValidatorMiddleware(object):
     def process_response(self, request, response):

File django/validator/urls.py

 from django.conf.urls.defaults import *
-from lukeplant_me_uk.django.apps.validator.models import ValidationFailure
+from lukeplant_me_uk.django.validator.models import ValidationFailure
 
 info_dict = {
     'queryset': ValidationFailure.objects.all(),
         'django.views.generic.list_detail.object_detail',
         info_dict),
     (r'^(?P<object_id>\d+)/delete/$', 
-        'lukeplant_me_uk.django.apps.validator.views.delete'),
+        'lukeplant_me_uk.django.validator.views.delete'),
     (r'^delete/$', 
-        'lukeplant_me_uk.django.apps.validator.views.bulkdelete'),
+        'lukeplant_me_uk.django.validator.views.bulkdelete'),
 )

File django/validator/views.py

-from lukeplant_me_uk.django.apps.validator.models import ValidationFailure
+from lukeplant_me_uk.django.validator.models import ValidationFailure
 from django.http import HttpResponseRedirect
 
 def bulkdelete(request):

File setup/djangovalidator/MANIFEST.in

-recursive-include lukeplant_me_uk/django/apps/validator *.html
+recursive-include lukeplant_me_uk/django/validator *.html
 include AUTHORS

File setup/djangovalidator/README

 ======================
 - Run setup.py to install the package into your python path.
 - Add "lukeplant_me_uk.django.apps.validator" to your INSTALLED_APPS setting.
-- Add the folder <WHERE_YOU_INSTALLED_IT>/lukeplant_me_uk/django/apps/validator/templates
+- Add the folder <WHERE_YOU_INSTALLED_IT>/lukeplant_me_uk/django/validator/templates
   to your TEMPLATE_DIRS setting
 - Insert the middleware
-"lukeplant_me_uk.django.middleware.validator.ValidatorMiddleware" near the
+"lukeplant_me_uk.django.validator.middleware.ValidatorMiddleware" near the
 beginning of the middleware list (which means it will get the the response
 object after everything else). It must be after every middleware that does
 post-processing, but mustn't be after GZip, since it can't handle gzipped

File setup/djangovalidator/setup.py

       py_modules = [
         'lukeplant_me_uk.__init__',
         'lukeplant_me_uk.django.__init__',
-        'lukeplant_me_uk.django.middleware.__init__',
-        'lukeplant_me_uk.django.middleware.validator',
-        'lukeplant_me_uk.django.apps.__init__',
-        'lukeplant_me_uk.django.apps.validator.__init__',
-        'lukeplant_me_uk.django.apps.validator.urls',
-        'lukeplant_me_uk.django.apps.validator.views',
-        'lukeplant_me_uk.django.apps.validator.models',
+        'lukeplant_me_uk.django.validator.__init__',
+        'lukeplant_me_uk.django.validator.urls',
+        'lukeplant_me_uk.django.validator.views',
+        'lukeplant_me_uk.django.validator.models',
+        'lukeplant_me_uk.django.validator.middleware',
       ],
       # Don't list higher level packages as otherwise all modules will be included
-      packages = ['lukeplant_me_uk.django.apps.validator'],
-      package_data = {'lukeplant_me_uk.django.apps.validator': ['templates/validator/*.html'] },
+      packages = ['lukeplant_me_uk.django.validator'],
+      package_data = {'lukeplant_me_uk.django.validator': ['templates/validator/*.html'] },
       classifiers = filter(None, classifiers.split("\n")),
       long_description = """\
 This app is intended to be plugged into a Django installation while
       #      namespace_packages = [
       #        'lukeplant_me_uk',
       #        'lukeplant_me_uk.django',
-      #        'lukeplant_me_uk.django.middleware',
-      #        'lukeplant_me_uk.django.apps',
       #      ],
       #      zip_safe = False,
 )