Started trying to heal some of the wounds time has inflicted - now ru…

…ns on Django 1.2.4

.gitignore

@@ -0,0 +1,5 @@
+*.pyc
+*.egg-info
+MANIFEST
+build/
+dist/

djangoffice/forms/__init__.py

@@ -1,9 +1,8 @@
 import md5
 import cPickle as pickle
 
-from django import newforms as forms
+from django import forms
 from django.db.models import Model
-from django.newforms.forms import BoundField
 
 def security_hash(self, request, form):
     """
@@ -75,6 +74,6 @@ def as_hidden(self):
         """
         output = []
         for name, field in self.fields.items():
-            bf = BoundField(self, field, name)
+            bf = forms.BoundField(self, field, name)
             output.append(bf.as_hidden())
         return u'\n'.join(output)

djangoffice/forms/activities.py

@@ -1,4 +1,4 @@
-from django import newforms as forms
+from django import forms
 from django.contrib.auth.models import User
 
 from djangoffice.forms import FilterBaseForm

djangoffice/forms/fields.py

@@ -1,10 +1,9 @@
 import copy
 from itertools import chain
 
-from django import newforms as forms
+from django import forms
 from django.core import validators
-from django.newforms.fields import EMPTY_VALUES
-from django.newforms.util import flatatt
+from django.forms.util import flatatt
 from django.utils.datastructures import MultiValueDict
 from django.utils.encoding import force_unicode
 from django.utils.html import escape
@@ -28,7 +27,7 @@ def clean(self, value):
         that a model instance with the given primary key exists.
         """
         value = super(DynamicModelChoiceField, self).clean(value)
-        if value in EMPTY_VALUES:
+        if value in validators.EMPTY_VALUES:
             value = None
         else:
             try:

djangoffice/forms/invoices.py

@@ -1,4 +1,4 @@
-from django import newforms as forms
+from django import forms
 from django.contrib.auth.models import User
 from django.template.defaultfilters import pluralize
 

djangoffice/forms/jobs.py

@@ -1,6 +1,6 @@
 import operator
 
-from django import newforms as forms
+from django import forms
 from django.contrib.auth.models import User
 from django.db.models.query import Q
 

djangoffice/forms/rates.py

@@ -1,4 +1,4 @@
-from django import newforms as forms
+from django import forms
 
 from djangoffice.models import TaskTypeRate, UserRate
 

djangoffice/forms/sql_reports.py

@@ -1,4 +1,4 @@
-from django import newforms as forms
+from django import forms
 
 class SQLReportParameterForm(forms.Form):
     def __init__(self, param_names, *args, **kwargs):

djangoffice/forms/timesheets.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 
-from django import newforms as forms
+from django import forms
 
 from djangoffice.forms.widgets import DateInput, HourInput, MoneyInput
 from djangoffice.models import Expense, ExpenseType, Task, TimeEntry

djangoffice/forms/users.py

@@ -1,4 +1,4 @@
-from django import newforms as forms
+from django import forms
 from django.contrib.auth.models import User
 
 from djangoffice.models import UserProfile

djangoffice/forms/widgets.py

@@ -1,33 +1,34 @@
-from django.newforms.widgets import Input, CheckboxInput, SelectMultiple
+from django import forms
+from django.forms import widgets
 from django.utils.encoding import force_unicode
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 
-class DateInput(Input):
+class DateInput(widgets.Input):
     input_type = 'text'
 
     def __init__(self, attrs=None):
         self.attrs = {'class': 'date', 'size': '10'}
         if attrs:
             self.attrs.update(attrs)
 
-class HourInput(Input):
+class HourInput(widgets.Input):
     input_type = 'text'
 
     def __init__(self, attrs=None):
         self.attrs = {'class': 'hours', 'size': '4'}
         if attrs:
             self.attrs.update(attrs)
 
-class MoneyInput(Input):
+class MoneyInput(widgets.Input):
     input_type = 'text'
 
     def __init__(self, attrs=None):
         self.attrs = {'class': 'money'}
         if attrs:
             self.attrs.update(attrs)
 
-class TableSelectMultiple(SelectMultiple):
+class TableSelectMultiple(forms.SelectMultiple):
     """
     Provides selection of items via checkboxes, with a table row
     being rendered for each item, the first cell in which contains the
@@ -68,7 +69,7 @@ def render(self, name, value, attrs=None, choices=()):
             # so that the checkboxes don't all have the same ID attribute.
             if has_id:
                 final_attrs = dict(final_attrs, id='%s_%s' % (attrs['id'], i))
-            cb = CheckboxInput(final_attrs, check_test=lambda value: value in str_values)
+            cb = forms.CheckboxInput(final_attrs, check_test=lambda value: value in str_values)
             option_value = force_unicode(option_value)
             rendered_cb = cb.render(name, option_value)
             output.append(u'<tr><td>%s</td>' % rendered_cb)