Made the shallow urls.py work as suggested

.gitignore

@@ -4,3 +4,9 @@ build/
 dist/
 docs/_build
 MANIFEST
+*.egg-info
+.tox/
+.cache/
+.coverage
+junit-*.xml
+coverage.xml

README.rst

@@ -1,6 +1,6 @@
-============================================================
- Frequently Asked Question (FAQ) management for Django apps
-============================================================
+==========================================================
+Frequently Asked Question (FAQ) management for Django apps
+==========================================================
 
 This Django_ application provides the ability to create and manage lists of
 Frequently Asked Questions (FAQ), organized by topic.
@@ -12,7 +12,7 @@ months.
 
 .. _Django: http://www.djangoproject.com/
 
-TODO’s
+TODO's
 ------
 
 Below are tasks that need done, features under consideration, and some

docs/conf.py

@@ -46,8 +46,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'django-faq'
-copyright = u'2012, Ben Spaulding'
+project = 'django-faq'
+copyright = '2012, Ben Spaulding'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -184,8 +184,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'django-faq.tex', u'django-faq Documentation',
-   u'Ben Spaulding', 'manual'),
+  ('index', 'django-faq.tex', 'django-faq Documentation',
+   'Ben Spaulding', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -217,8 +217,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'django-faq', u'django-faq Documentation',
-     [u'Ben Spaulding'], 1)
+    ('index', 'django-faq', 'django-faq Documentation',
+     ['Ben Spaulding'], 1)
 ]
 
 

faq/__init__.py

@@ -15,10 +15,23 @@
 
 """
 
-from django.utils.translation import ugettext_lazy as _
-
-
-__version__ = '0.8.3'
-
-# Mark the app_label for translation.
-_(u'faq')
+__version_info__ = {
+    'major': 1,
+    'minor': 0,
+    'micro': 0,
+    'releaselevel': 'final',
+    'serial': 1
+}
+
+
+def get_version(short=False):
+    assert __version_info__['releaselevel'] in ('alpha', 'beta', 'final')
+    vers = ["%(major)i.%(minor)i" % __version_info__, ]
+    if __version_info__['micro']:
+        vers.append(".%(micro)i" % __version_info__)
+    if __version_info__['releaselevel'] != 'final' and not short:
+        vers.append('%s%i' % (
+            __version_info__['releaselevel'][0], __version_info__['serial']))
+    return ''.join(vers)
+
+__version__ = get_version()

faq/admin.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin
-from django.contrib.sites.models import Site
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_noop, ungettext
 
@@ -26,8 +25,8 @@ def update_status(modeladmin, request, queryset, status):
         obj.save()
         # Now log what happened.
         # Use ugettext_noop() 'cause this is going straight into the db.
-        log_message = ugettext_noop(u'Changed status to \'%s\'.' %
-            obj.get_status_display())
+        log_message = ugettext_noop('Changed status to \'%s\'.' %
+                                    obj.get_status_display())
         modeladmin.log_change(request, obj, log_message)
 
     # Send a message to the user telling them what has happened.
@@ -39,8 +38,8 @@ def update_status(modeladmin, request, queryset, status):
     if not message_dict['count'] == 1:
         message_dict['object'] = modeladmin.model._meta.verbose_name_plural
     user_message = ungettext(
-        u'%(count)s %(object)s was successfully %(verb)s.',
-        u'%(count)s  %(object)s were successfully %(verb)s.',
+        '%(count)s %(object)s was successfully %(verb)s.',
+        '%(count)s  %(object)s were successfully %(verb)s.',
         message_dict['count']) % message_dict
     modeladmin.message_user(request, user_message)
 
@@ -53,19 +52,19 @@ def update_status(modeladmin, request, queryset, status):
 def draft(modeladmin, request, queryset):
     """Admin action for setting status of selected items to 'drafted'."""
     return update_status(modeladmin, request, queryset, DRAFTED)
-draft.short_description = _(u'Draft selected %(verbose_name_plural)s')
+draft.short_description = _('Draft selected %(verbose_name_plural)s')
 
 
 def publish(modeladmin, request, queryset):
     """Admin action for setting status of selected items to 'published'."""
     return update_status(modeladmin, request, queryset, PUBLISHED)
-publish.short_description = _(u'Publish selected %(verbose_name_plural)s')
+publish.short_description = _('Publish selected %(verbose_name_plural)s')
 
 
 def remove(modeladmin, request, queryset):
     """Admin action for setting status of selected items to 'removed'."""
     return update_status(modeladmin, request, queryset, REMOVED)
-remove.short_description = _(u'Remove selected %(verbose_name_plural)s')
+remove.short_description = _('Remove selected %(verbose_name_plural)s')
 
 
 # Inlines.
@@ -99,14 +98,13 @@ class TopicAdmin(FAQAdminBase):
     def question_count(self, obj):
         """Returns the total number of Questions for this topic."""
         return obj.questions.count()
-    question_count.short_description = _(u'No. of Questions')
+    question_count.short_description = _('No. of Questions')
 
 
 class QuestionAdmin(FAQAdminBase):
     fieldsets = (
         (None, {
-            'fields': ('topic', 'question', 'slug', 'answer', 'status',
-                'ordering')}),
+            'fields': ('topic', 'question', 'slug', 'answer', 'status', 'ordering')}),
     )
     list_display = ('question', 'topic', 'status', 'ordering')
     list_filter = ('status', 'topic', 'modified', 'created')