From 99fde585a39d7867d2c2257b74a7cc441bc9f2a5 Mon Sep 17 00:00:00 2001 From: SVN-Git Migration Date: Thu, 8 Oct 2015 11:51:48 -0700 Subject: Imported Upstream version 0.3 --- ._setup.py | Bin 0 -> 187 bytes PKG-INFO | 18 ++++++++++++++++++ setup.py | 4 ++-- tagging/admin.py | 10 +++++++++- tagging/forms.py | 4 ++-- 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 ._setup.py create mode 100644 PKG-INFO diff --git a/._setup.py b/._setup.py new file mode 100644 index 0000000..b052229 Binary files /dev/null and b/._setup.py differ diff --git a/PKG-INFO b/PKG-INFO new file mode 100644 index 0000000..5808eb1 --- /dev/null +++ b/PKG-INFO @@ -0,0 +1,18 @@ +Metadata-Version: 1.0 +Name: django-tagging +Version: 0.3 +Summary: Generic tagging application for Django +Home-page: http://code.google.com/p/django-tagging/ +Author: Jonathan Buchanan +Author-email: jonathan.buchanan@gmail.com +License: UNKNOWN +Description: UNKNOWN +Platform: UNKNOWN +Classifier: Development Status :: 4 - Beta +Classifier: Environment :: Web Environment +Classifier: Framework :: Django +Classifier: Intended Audience :: Developers +Classifier: License :: OSI Approved :: BSD License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python +Classifier: Topic :: Utilities diff --git a/setup.py b/setup.py index bcfd6d5..a755df8 100644 --- a/setup.py +++ b/setup.py @@ -46,14 +46,14 @@ for dirpath, dirnames, filenames in os.walk(tagging_dir): data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]]) # Dynamically calculate the version based on tagging.VERSION -version_tuple = (0, 3, 'pre') +version_tuple = (0, 3, None) if version_tuple[2] is not None: version = "%d.%d_%s" % version_tuple else: version = "%d.%d" % version_tuple[:2] setup( - name = 'tagging', + name = 'django-tagging', version = version, description = 'Generic tagging application for Django', author = 'Jonathan Buchanan', diff --git a/tagging/admin.py b/tagging/admin.py index 4c1ef38..bec3922 100644 --- a/tagging/admin.py +++ b/tagging/admin.py @@ -1,5 +1,13 @@ from django.contrib import admin from tagging.models import Tag, TaggedItem +from tagging.forms import TagAdminForm + +class TagAdmin(admin.ModelAdmin): + form = TagAdminForm admin.site.register(TaggedItem) -admin.site.register(Tag) +admin.site.register(Tag, TagAdmin) + + + + diff --git a/tagging/forms.py b/tagging/forms.py index a70ac6b..a2d9fd9 100644 --- a/tagging/forms.py +++ b/tagging/forms.py @@ -8,7 +8,7 @@ from tagging import settings from tagging.models import Tag from tagging.utils import parse_tag_input -class AdminTagForm(forms.ModelForm): +class TagAdminForm(forms.ModelForm): class Meta: model = Tag @@ -16,7 +16,7 @@ class AdminTagForm(forms.ModelForm): value = self.cleaned_data['name'] tag_names = parse_tag_input(value) if len(tag_names) > 1: - raise ValidationError(_('Multiple tags were given.')) + raise forms.ValidationError(_('Multiple tags were given.')) elif len(tag_names[0]) > settings.MAX_TAG_LENGTH: raise forms.ValidationError( _('A tag may be no more than %s characters long.') % -- cgit v1.2.3