simonw
diff --git a/Collapse file: blog/feeds.py
‎blog/feeds.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: blog/feeds.py
‎blog/feeds.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: blog/management/commands/import_blog_json.py
‎blog/management/commands/import_blog_json.py‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file: blog/management/commands/import_blog_json.py
‎blog/management/commands/import_blog_json.py‎
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/Collapse file: blog/management/commands/import_blog_xml.py
‎blog/management/commands/import_blog_xml.py‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file: blog/management/commands/import_blog_xml.py
‎blog/management/commands/import_blog_xml.py‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file: blog/management/commands/import_quora.py
‎blog/management/commands/import_quora.py‎
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/Collapse file: blog/management/commands/import_quora.py
‎blog/management/commands/import_quora.py‎
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/Collapse file: blog/management/commands/reindex_all.py
‎blog/management/commands/reindex_all.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: blog/management/commands/reindex_all.py
‎blog/management/commands/reindex_all.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: blog/management/commands/validate_entries_xml.py
‎blog/management/commands/validate_entries_xml.py‎
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/Collapse file: blog/management/commands/validate_entries_xml.py
‎blog/management/commands/validate_entries_xml.py‎
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/Collapse file: blog/migrations/0001_initial.py
‎blog/migrations/0001_initial.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: blog/migrations/0001_initial.py
‎blog/migrations/0001_initial.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: blog/migrations/0002_auto_20150713_0551.py
‎blog/migrations/0002_auto_20150713_0551.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: blog/migrations/0002_auto_20150713_0551.py
‎blog/migrations/0002_auto_20150713_0551.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: blog/migrations/0003_auto_20170926_0641.py
‎blog/migrations/0003_auto_20170926_0641.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: blog/migrations/0003_auto_20170926_0641.py
‎blog/migrations/0003_auto_20170926_0641.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file: blog/migrations/0004_metadata_json.py
‎blog/migrations/0004_metadata_json.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file: blog/migrations/0004_metadata_json.py
‎blog/migrations/0004_metadata_json.py‎
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -81,7 +81,7 @@ def item_title(self, item):
         elif isinstance(item, Blogmark):
             return item.link_title
         else:
-            return u'Quoting %s' % item.source
+            return 'Quoting %s' % item.source
 
 
 def sitemap(request):
 
@@ -48,9 +48,9 @@ def handle(self, *args, **kwargs):
                     slug__iexact=slug,
                 ))
                 if matches:
-                    print 'Found match for %s: %s / %s : %s' % (
+                    print('Found match for %s: %s / %s : %s' % (
                         klass, created, slug, matches
-                    )
+                    ))
                     skipit = True
                     break
             if skipit:
@@ -90,4 +90,4 @@ def handle(self, *args, **kwargs):
                 t = Tag.objects.get_or_create(tag=tag)[0]
                 obj.tags.add(t)
             obj.tags.add(tag_with_tag)
-            print obj, obj.get_absolute_url()
+            print(obj, obj.get_absolute_url())
@@ -61,7 +61,7 @@ def import_entries(xmldir):
             title = row['title'],
             slug = row['slug'],
         ))
-        print entry, created
+        print(entry, created)
 
     # Now associate entries with tags
     for row in iter_rows(os.path.join(xmldir, 'blog_entry_tags.xml')):
@@ -165,5 +165,5 @@ def import_comments(xmldir):
         ))
         i += 1
         if i % 100 == 0:
-            print i
+            print(i)
             sys.stdout.flush()
@@ -41,11 +41,11 @@ def handle(self, *args, **kwargs):
             ).replace(tzinfo=utc)
             truncated_question = question
             if len(truncated_question) > 250:
-                truncated_question = truncated_question[:250] + u'...'
-            body = u'<p><em>My answer to <a href="%s">%s</a> on Quora</em></p>' % (
+                truncated_question = truncated_question[:250] + '...'
+            body = '<p><em>My answer to <a href="%s">%s</a> on Quora</em></p>' % (
                 url, escape(question)
             )
-            body += u'\n\n' + answer
+            body += '\n\n' + answer
             body = body.replace('&nbsp;', ' ')
             slug = slugify(' '.join(truncated_question.split()[:4]))
             with transaction.atomic():
@@ -61,7 +61,7 @@ def handle(self, *args, **kwargs):
                     tag = quora_to_tag.get(topic)
                     if tag:
                         entry.tags.add(Tag.objects.get_or_create(tag=tag)[0])
-            print entry
+            print(entry)
 
 
 def clean_answer(html):
@@ -104,13 +104,13 @@ def clean_answer(html):
             </iframe>
         ''' % src))
 
-    html = unicode(soup)
-    html = html.replace(u'<a href="/', u'<a href="https://www.quora.com/')
+    html = str(soup)
+    html = html.replace('<a href="/', '<a href="https://www.quora.com/')
     # Replace <br /><br /> with paragraphs
-    chunks = html.split(u'<br /><br />')
+    chunks = html.split('<br /><br />')
     new_chunks = []
     for chunk in chunks:
         if not chunk.startswith('<'):
-            chunk = u'<p>%s</p>' % chunk
+            chunk = '<p>%s</p>' % chunk
         new_chunks.append(chunk)
-    return u'\n\n'.join(new_chunks)
+    return '\n\n'.join(new_chunks)
@@ -12,4 +12,4 @@ def handle(self, *args, **kwargs):
                 obj.save()
                 i += 1
                 if i % 100 == 0:
-                    print klass, i
+                    print(klass, i)
@@ -12,8 +12,8 @@ def handle(self, *args, **kwargs):
                 ElementTree.fromstring(
                     '<entry>%s</entry>' % entry.body.encode('utf8')
                 )
-            except Exception, e:
-                print e
-                print entry.title
-                print 'https://simonwillison.com/admin/blog/entry/%d/' % entry.pk
-                print
+            except Exception as e:
+                print(e)
+                print(entry.title)
+                print('https://simonwillison.com/admin/blog/entry/%d/' % entry.pk)
+                print()
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.db import models, migrations
 
 
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.5 on 2017-09-26 06:41
-from __future__ import unicode_literals
+
 
 from django.db import migrations
 
 
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.5 on 2017-09-29 06:03
-from __future__ import unicode_literals
+
 
 import django.contrib.postgres.fields.jsonb
 from django.db import migrations