', ctxt)
diff --git a/categories/urls.py b/categories/urls.py
index c666c62..986df79 100644
--- a/categories/urls.py
+++ b/categories/urls.py
@@ -1,16 +1,8 @@
from django.conf.urls import url
+from django.views.generic import ListView
from .models import Category
from . import views
-try:
- from django.views.generic import DetailView, ListView
-except ImportError:
- try:
- from cbv import DetailView, ListView
- except ImportError:
- from django.core.exceptions import ImproperlyConfigured
- raise ImproperlyConfigured("For older versions of Django, you need django-cbv.")
-
categorytree_dict = {
'queryset': Category.objects.filter(level=0)
diff --git a/categories/views.py b/categories/views.py
index 21311d6..e844b48 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -17,16 +17,17 @@ except ImportError:
from .models import Category
-def category_detail(request, path,
- template_name='categories/category_detail.html', extra_context={}):
+def category_detail(request, path, template_name='categories/category_detail.html', extra_context={}):
path_items = path.strip('/').split('/')
if len(path_items) >= 2:
- category = get_object_or_404(Category,
+ category = get_object_or_404(
+ Category,
slug__iexact=path_items[-1],
level=len(path_items) - 1,
parent__slug__iexact=path_items[-2])
else:
- category = get_object_or_404(Category,
+ category = get_object_or_404(
+ Category,
slug__iexact=path_items[-1],
level=len(path_items) - 1)
diff --git a/doc_src/code_examples/custom_categories1.py b/doc_src/code_examples/custom_categories1.py
index 72eb2ca..c8d4652 100644
--- a/doc_src/code_examples/custom_categories1.py
+++ b/doc_src/code_examples/custom_categories1.py
@@ -1,9 +1,10 @@
from categories.models import CategoryBase
+
class SimpleCategory(CategoryBase):
"""
A simple of catgorizing example
"""
-
+
class Meta:
verbose_name_plural = 'simple categories'
diff --git a/doc_src/code_examples/custom_categories2.py b/doc_src/code_examples/custom_categories2.py
index 4a81b6d..53cf264 100644
--- a/doc_src/code_examples/custom_categories2.py
+++ b/doc_src/code_examples/custom_categories2.py
@@ -4,7 +4,8 @@ from categories.admin import CategoryBaseAdmin
from .models import SimpleCategory
+
class SimpleCategoryAdmin(CategoryBaseAdmin):
pass
-admin.site.register(SimpleCategory, SimpleCategoryAdmin)
\ No newline at end of file
+admin.site.register(SimpleCategory, SimpleCategoryAdmin)
diff --git a/doc_src/code_examples/custom_categories3.py b/doc_src/code_examples/custom_categories3.py
index 57907e2..d2aaa6f 100644
--- a/doc_src/code_examples/custom_categories3.py
+++ b/doc_src/code_examples/custom_categories3.py
@@ -1,8 +1,12 @@
+from categories import models, settings
+from categories.base import CategoryBase
+
+
class Category(CategoryBase):
thumbnail = models.FileField(
- upload_to=THUMBNAIL_UPLOAD_PATH,
+ upload_to=settings.THUMBNAIL_UPLOAD_PATH,
null=True, blank=True,
- storage=STORAGE(),)
+ storage=settings.THUMBNAIL_STORAGE,)
thumbnail_width = models.IntegerField(blank=True, null=True)
thumbnail_height = models.IntegerField(blank=True, null=True)
order = models.IntegerField(default=0)
@@ -12,8 +16,8 @@ class Category(CategoryBase):
max_length=100,
help_text="An alternative title to use on pages with this category.")
alternate_url = models.CharField(
- blank=True,
- max_length=200,
+ blank=True,
+ max_length=200,
help_text="An alternative URL to use instead of the one derived from "
"the category hierarchy.")
description = models.TextField(blank=True, null=True)
@@ -26,4 +30,4 @@ class Category(CategoryBase):
blank=True,
default="",
help_text="(Advanced) Any additional HTML to be placed verbatim "
- "in the <head>")
\ No newline at end of file
+ "in the <head>")
diff --git a/doc_src/code_examples/custom_categories4.py b/doc_src/code_examples/custom_categories4.py
index 4a4fa65..87e1d3a 100644
--- a/doc_src/code_examples/custom_categories4.py
+++ b/doc_src/code_examples/custom_categories4.py
@@ -1,3 +1,6 @@
+from categories.models import Category
+
+
def save(self, *args, **kwargs):
if self.thumbnail:
from django.core.files.images import get_image_dimensions
@@ -8,8 +11,8 @@ def save(self, *args, **kwargs):
width, height = get_image_dimensions(self.thumbnail.file, close=True)
else:
width, height = None, None
-
+
self.thumbnail_width = width
self.thumbnail_height = height
-
- super(Category, self).save(*args, **kwargs)
\ No newline at end of file
+
+ super(Category, self).save(*args, **kwargs)
diff --git a/doc_src/code_examples/custom_categories5.py b/doc_src/code_examples/custom_categories5.py
index 2dfc16f..67109c6 100644
--- a/doc_src/code_examples/custom_categories5.py
+++ b/doc_src/code_examples/custom_categories5.py
@@ -1,5 +1,9 @@
+from categories.base import CategoryBase
+
+
class Meta(CategoryBase.Meta):
verbose_name_plural = 'categories'
+
class MPTTMeta:
order_insertion_by = ('order', 'name')
diff --git a/doc_src/code_examples/custom_categories6.py b/doc_src/code_examples/custom_categories6.py
index c649ab7..3c09f03 100644
--- a/doc_src/code_examples/custom_categories6.py
+++ b/doc_src/code_examples/custom_categories6.py
@@ -1,9 +1,13 @@
+from categories.base import CategoryBaseAdminForm
+from categories.models import Category
+
+
class CategoryAdminForm(CategoryBaseAdminForm):
class Meta:
model = Category
-
+
def clean_alternate_title(self):
if self.instance is None or not self.cleaned_data['alternate_title']:
return self.cleaned_data['name']
else:
- return self.cleaned_data['alternate_title']
\ No newline at end of file
+ return self.cleaned_data['alternate_title']
diff --git a/doc_src/code_examples/custom_categories7.py b/doc_src/code_examples/custom_categories7.py
index dc48499..4fcc1a2 100644
--- a/doc_src/code_examples/custom_categories7.py
+++ b/doc_src/code_examples/custom_categories7.py
@@ -1,3 +1,7 @@
+from categories.admin import CategoryAdminForm
+from categories.base import CategoryBaseAdmin
+
+
class CategoryAdmin(CategoryBaseAdmin):
form = CategoryAdminForm
list_display = ('name', 'alternate_title', 'active')
@@ -6,12 +10,12 @@ class CategoryAdmin(CategoryBaseAdmin):
'fields': ('parent', 'name', 'thumbnail', 'active')
}),
('Meta Data', {
- 'fields': ('alternate_title', 'alternate_url', 'description',
- 'meta_keywords', 'meta_extra'),
+ 'fields': ('alternate_title', 'alternate_url', 'description',
+ 'meta_keywords', 'meta_extra'),
'classes': ('collapse',),
}),
('Advanced', {
'fields': ('order', 'slug'),
'classes': ('collapse',),
}),
- )
\ No newline at end of file
+ )
diff --git a/doc_src/conf.py b/doc_src/conf.py
index 5773732..0ffb72f 100644
--- a/doc_src/conf.py
+++ b/doc_src/conf.py
@@ -11,7 +11,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import sys, os
+import sys
+import os
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -19,7 +20,7 @@ import sys, os
sys.path.append(os.path.abspath('..'))
os.environ['DJANGO_SETTINGS_MODULE'] = 'example.settings'
-import categories
+import categories # noqa
# -- General configuration -----------------------------------------------------
@@ -34,7 +35,7 @@ templates_path = ['_templates']
source_suffix = '.rst'
# The encoding of source files.
-#source_encoding = 'utf-8'
+# ource_encoding = 'utf-8'
# The master toctree document.
master_doc = 'index'
@@ -54,40 +55,40 @@ release = categories.get_version()
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
-#language = None
+# anguage = None
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
-#today = ''
+# oday = ''
# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# oday_fmt = '%B %d, %Y'
# List of documents that shouldn't be included in the build.
-#unused_docs = []
+# nused_docs = []
# List of directories, relative to source directory, that shouldn't be searched
# for source files.
exclude_trees = ['_build']
# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# efault_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# dd_function_parentheses = True
# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
-#add_module_names = True
+# dd_module_names = True
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
-#show_authors = False
+# how_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# odindex_common_prefix = []
# -- Options for HTML output ---------------------------------------------------
@@ -99,26 +100,26 @@ html_theme = 'default'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
# documentation.
-#html_theme_options = {}
+# tml_theme_options = {}
# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# tml_theme_path = []
# The name for this set of Sphinx documents. If None, it defaults to
# " v documentation".
-#html_title = None
+# tml_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
+# tml_short_title = None
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
-#html_logo = None
+# tml_logo = None
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
-#html_favicon = None
+# tml_favicon = None
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
@@ -127,38 +128,38 @@ html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# tml_last_updated_fmt = '%b %d, %Y'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
-#html_use_smartypants = True
+# tml_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# tml_sidebars = {}
# Additional templates that should be rendered to pages, maps page names to
# template names.
-#html_additional_pages = {}
+# tml_additional_pages = {}
# If false, no module index is generated.
-#html_use_modindex = True
+# tml_use_modindex = True
# If false, no index is generated.
-#html_use_index = True
+# tml_use_index = True
# If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# tml_split_index = False
# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# tml_show_sourcelink = True
# If true, an OpenSearch description file will be output, and all pages will
# contain a tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# tml_use_opensearch = ''
# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
+# tml_file_suffix = ''
# Output file base name for HTML help builder.
htmlhelp_basename = 'DjangoCategoriesdoc'
@@ -167,31 +168,30 @@ htmlhelp_basename = 'DjangoCategoriesdoc'
# -- Options for LaTeX output --------------------------------------------------
# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
+# atex_paper_size = 'letter'
# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+# atex_font_size = '10pt'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('index', 'DjangoCategories.tex', 'Django Categories Documentation',
- 'CoreyOordt', 'manual'),
+ ('index', 'DjangoCategories.tex', 'Django Categories Documentation', 'CoreyOordt', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
-#latex_logo = None
+# atex_logo = None
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
-#latex_use_parts = False
+# atex_use_parts = False
# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+# atex_preamble = ''
# Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# atex_appendices = []
# If false, no module index is generated.
-#latex_use_modindex = True
+# atex_use_modindex = True
diff --git a/example/simpletext/admin.py b/example/simpletext/admin.py
index 9060c31..573370d 100644
--- a/example/simpletext/admin.py
+++ b/example/simpletext/admin.py
@@ -3,6 +3,7 @@ from django.contrib import admin
from categories.admin import CategoryBaseAdmin, CategoryBaseAdminForm
+
class SimpleTextAdmin(admin.ModelAdmin):
fieldsets = (
(None, {
@@ -16,8 +17,9 @@ class SimpleCategoryAdminForm(CategoryBaseAdminForm):
model = SimpleCategory
fields = '__all__'
+
class SimpleCategoryAdmin(CategoryBaseAdmin):
form = SimpleCategoryAdminForm
admin.site.register(SimpleText, SimpleTextAdmin)
-admin.site.register(SimpleCategory, SimpleCategoryAdmin)
\ No newline at end of file
+admin.site.register(SimpleCategory, SimpleCategoryAdmin)
diff --git a/example/simpletext/models.py b/example/simpletext/models.py
index ea5e81d..28aca89 100755
--- a/example/simpletext/models.py
+++ b/example/simpletext/models.py
@@ -2,15 +2,16 @@ from django.db import models
from categories.base import CategoryBase
+
class SimpleText(models.Model):
"""
(SimpleText description)
"""
- name = models.CharField(max_length=255)
+ name = models.CharField(max_length=255)
description = models.TextField(blank=True)
- created = models.DateTimeField(auto_now_add=True)
- updated = models.DateTimeField(auto_now=True)
+ created = models.DateTimeField(auto_now_add=True)
+ updated = models.DateTimeField(auto_now=True)
class Meta:
verbose_name_plural = 'Simple Text'
@@ -27,13 +28,14 @@ class SimpleText(models.Model):
def get_absolute_url(self):
return ('simpletext_detail_view_name', [str(self.id)])
+
class SimpleCategory(CategoryBase):
"""A Test of catgorizing"""
class Meta:
verbose_name_plural = 'simple categories'
-#import categories
+# mport categories
-#categories.register_fk(SimpleText, 'primary_category', {'related_name':'simpletext_primary_set'})
-#categories.register_m2m(SimpleText, 'cats', )
+# ategories.register_fk(SimpleText, 'primary_category', {'related_name':'simpletext_primary_set'})
+# ategories.register_m2m(SimpleText, 'cats', )
diff --git a/example/simpletext/tests.py b/example/simpletext/tests.py
index c7c4668..f54e74f 100755
--- a/example/simpletext/tests.py
+++ b/example/simpletext/tests.py
@@ -7,6 +7,7 @@ Replace these with more appropriate tests for your application.
from django.test import TestCase
+
class SimpleTest(TestCase):
def test_basic_addition(self):
"""
@@ -20,4 +21,3 @@ Another way to test that 1 + 1 is equal to 2.
>>> 1 + 1 == 2
True
"""}
-
diff --git a/example/urls.py b/example/urls.py
index d19d430..5c660e4 100644
--- a/example/urls.py
+++ b/example/urls.py
@@ -1,14 +1,12 @@
-from django.conf.urls import include, url
+import os
-# Uncomment the next two lines to enable the admin:
+from django.conf.urls import include, url
from django.contrib import admin
from django.views.static import serve
admin.autodiscover()
-import os
-
ROOT_PATH = os.path.dirname(os.path.dirname(__file__))
urlpatterns = (
@@ -22,7 +20,7 @@ urlpatterns = (
# Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
url(r'^categories/', include('categories.urls')),
- #(r'^cats/', include('categories.urls')),
+ # r'^cats/', include('categories.urls')),
url(r'^static/categories/(?P.*)$', serve,
{'document_root': ROOT_PATH + '/categories/media/categories/'}),
@@ -31,7 +29,6 @@ urlpatterns = (
# {'document_root': ROOT_PATH + '/editor/media/editor/',
# 'show_indexes':True}),
- url(r'^static/(?P.*)$', serve,
- {'document_root': os.path.join(ROOT_PATH, 'example', 'static')}),
+ url(r'^static/(?P.*)$', serve, {'document_root': os.path.join(ROOT_PATH, 'example', 'static')}),
)
diff --git a/setup.py b/setup.py
index c2165fe..0422ff8 100644
--- a/setup.py
+++ b/setup.py
@@ -25,6 +25,6 @@ setup(
classifiers=[
'Framework :: Django',
],
- install_requires = reqs,
- dependency_links = []
+ install_requires=reqs,
+ dependency_links=[]
)
diff --git a/tox.ini b/tox.ini
index 32fb129..df93f7b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
[tox]
envlist =
+ py27-lint
py27-django{18,19},
py34-django{18,19},
py35-django{18,19},
@@ -12,3 +13,10 @@ deps=
commands=
{toxinidir}/example/manage.py test --settings='settings-testing' categories
+
+[testenv:py27-lint]
+deps=
+ flake8
+
+commands=
+ flake8 . --ignore=E501 --exclude=categories/south_migrations/