From 041b490e7ff72dfcd9379235f67242dccb58db5d Mon Sep 17 00:00:00 2001 From: Andrew Davidson Date: Sun, 28 Dec 2014 08:20:38 -0800 Subject: [PATCH] updating scripts to use python3.4 specifically --- csv_import.py | 10 +++++----- json_import.py | 2 +- run_jobs.py | 6 +++--- xml_import.py | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/csv_import.py b/csv_import.py index 6a1802f..d8865ec 100755 --- a/csv_import.py +++ b/csv_import.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.4 import os, re from flask.ext.mongoengine import MongoEngine @@ -21,10 +21,10 @@ ArchivedText.objects.all().delete() ArchivedImage.objects.all().delete() ### -# Fixed field order: +# Fixed field order: # URL, TITLE, NOTE, DATE, TAGS, UNREAD, SOURCE ### -# Notes on processing assumptions: +# Notes on processing assumptions: # UNREAD field is 1/0 integer compare # Escape commas with ^comma^ in raw fields before CSV export # Watch for NEWLINE/CRLF issues @@ -39,7 +39,7 @@ for line in file.readlines(): if Bookmark.objects(url=filtered_url).count() == 0: print("URL: " + URL) b.url = filtered_url - else: + else: print("Duplicate URL: " + URL) continue print("Title: " + TITLE) @@ -50,7 +50,7 @@ for line in file.readlines(): b.created_at = datetime.datetime(*map(int, re.split('[^\d]', DATE)[:-1])) if b.created_at < date_marker: date_marker = b.created_at - else: + else: b.created_at = date_marker print("Date: " + b.created_at.strftime("%Y/%m/%d")) diff --git a/json_import.py b/json_import.py index 1584618..117ac44 100755 --- a/json_import.py +++ b/json_import.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.4 import os, re from flask.ext.mongoengine import MongoEngine diff --git a/run_jobs.py b/run_jobs.py index 4bc4d90..c1564a4 100755 --- a/run_jobs.py +++ b/run_jobs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.4 import os, re from flask.ext.mongoengine import MongoEngine @@ -18,10 +18,10 @@ for b in Bookmark.objects(archived_text_needed = True): except: print("Text archive failed.") -for b in Bookmark.objects(archived_image_needed = True): +for b in Bookmark.objects(archived_image_needed = True): print("Archiving image for " + b.short) try: update_archived_image(b) print("image archived.") except: - print("image archive failed.") + print("image archive failed.") diff --git a/xml_import.py b/xml_import.py index cda4d35..0f48878 100755 --- a/xml_import.py +++ b/xml_import.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python3.4 import os, re from flask.ext.mongoengine import MongoEngine @@ -45,5 +45,4 @@ for i in soup(["bookmark"]): print(str(count)+" - "+b.short) print(b.title) print(b.url) - - \ No newline at end of file +