aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 11:51:48 -0700
committerSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 11:51:48 -0700
commit99fde585a39d7867d2c2257b74a7cc441bc9f2a5 (patch)
tree167478fa40772d1c51598692e27a790c51defdb8
parent71ac4bf01bb5d6dad8eb77b783a0b06cf4fdeb1e (diff)
downloadpython-django-tagging-99fde585a39d7867d2c2257b74a7cc441bc9f2a5.tar
python-django-tagging-99fde585a39d7867d2c2257b74a7cc441bc9f2a5.tar.gz
Imported Upstream version 0.3upstream/0.3
-rw-r--r--._setup.pybin0 -> 187 bytes
-rw-r--r--PKG-INFO18
-rw-r--r--setup.py4
-rw-r--r--tagging/admin.py10
-rw-r--r--tagging/forms.py4
5 files changed, 31 insertions, 5 deletions
diff --git a/._setup.py b/._setup.py
new file mode 100644
index 0000000..b052229
--- /dev/null
+++ b/._setup.py
Binary files 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.') %