diff --git a/docs/source/conf.py b/docs/source/conf.py index ecd2d43..4e84293 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -12,7 +12,6 @@ # serve to show the default. import re -import six import sys, os, os.path # If extensions (or modules to document with autodoc) are in another directory, @@ -43,8 +42,8 @@ out = os.path.join(static_root, '%s.html' % script) if os.path.exists(out): os.unlink(out) - with open(out, 'wb+') as f: - f.write(six.u(html)) + with open(out, 'w') as f: + f.write(html) # -- General configuration ----------------------------------------------------- @@ -68,8 +67,8 @@ master_doc = 'index' # General information about the project. -project = u'django-session-security' -copyright = u'2012-2015, James Pic and contributors' +project = 'django-session-security' +copyright = '2012-2015, James Pic and contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -211,8 +210,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-session-security.tex', u'django-session-security Documentation', - u'James Pic', 'manual'), + ('index', 'django-session-security.tex', 'django-session-security Documentation', + 'James Pic', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -241,8 +240,8 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'django-session-security', u'django-session-security Documentation', - [u'James Pic'], 1) + ('index', 'django-session-security', 'django-session-security Documentation', + ['James Pic'], 1) ] # If true, show URL addresses after external links. @@ -255,8 +254,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'django-session-security', u'django-session-security Documentation', - u'James Pic', 'django-session-security', 'One line description of project.', + ('index', 'django-session-security', 'django-session-security Documentation', + 'James Pic', 'django-session-security', 'One line description of project.', 'Miscellaneous'), ] diff --git a/session_security/tests/test_views.py b/session_security/tests/test_views.py index f865864..47e1ff4 100644 --- a/session_security/tests/test_views.py +++ b/session_security/tests/test_views.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - import time from datetime import datetime, timedelta import unittest