Merge c290d66 into d51e7d1

dreidev · May 21, 2017 · 5cd05ab · 5cd05ab
2 parents d51e7d1 + c290d66
commit 5cd05ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/comments/migrations/0001_initial.py b/comments/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 from django.conf import settings

diff --git a/comments/templatetags/comments_tags.py b/comments/templatetags/comments_tags.py
@@ -41,7 +41,7 @@ def get_comments(object, user):
         except:
             liked.append(False)
     return {"form": CommentForm(),
-            "comment_liked": zip(comments, liked),
+            "comment_liked": list(zip(comments, liked)),
             "target": object,
             "user": user,
             "comments_count": comments.count(),

diff --git a/docs/conf.py b/docs/conf.py
@@ -47,9 +47,9 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'django-ajax-comments'
-copyright = u'2015, DREIDEV'
-author = u'DREIDEV'
+project = 'django-ajax-comments'
+copyright = '2015, DREIDEV'
+author = 'DREIDEV'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -224,8 +224,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  (master_doc, 'django-ajax-comments.tex', u'django-ajax-comments Documentation',
-   u'DREIDEV', 'manual'),
+  (master_doc, 'django-ajax-comments.tex', 'django-ajax-comments Documentation',
+   'DREIDEV', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -254,7 +254,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'django-ajax-comments', u'django-ajax-comments Documentation',
+    (master_doc, 'django-ajax-comments', 'django-ajax-comments Documentation',
      [author], 1)
 ]
 
@@ -268,7 +268,7 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  (master_doc, 'django-ajax-comments', u'django-ajax-comments Documentation',
+  (master_doc, 'django-ajax-comments', 'django-ajax-comments Documentation',
    author, 'django-ajax-comments', 'One line description of project.',
    'Miscellaneous'),
 ]

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 setup(
     name='django-ajax-comments',
     version='1.1.0.dev1',
-    author=u'DREIDEV',
+    author='DREIDEV',
     author_email='info@dreidev.com',
     url='https://github.com/dreidev/Comments',
     license='MIT',