diff options
21 files changed, 36 insertions, 37 deletions
diff --git a/hamnadmin/hamnadmin/mailqueue/admin.py b/hamnadmin/hamnadmin/mailqueue/admin.py index 50ddc9e..1f1d671 100644 --- a/hamnadmin/hamnadmin/mailqueue/admin.py +++ b/hamnadmin/hamnadmin/mailqueue/admin.py @@ -2,7 +2,7 @@ from django.contrib import admin from email.parser import Parser -from models import QueuedMail +from .models import QueuedMail class QueuedMailAdmin(admin.ModelAdmin): model = QueuedMail diff --git a/hamnadmin/hamnadmin/mailqueue/migrations/0001_initial.py b/hamnadmin/hamnadmin/mailqueue/migrations/0001_initial.py index cd39282..84e5163 100644 --- a/hamnadmin/hamnadmin/mailqueue/migrations/0001_initial.py +++ b/hamnadmin/hamnadmin/mailqueue/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/hamnadmin/hamnadmin/mailqueue/util.py b/hamnadmin/hamnadmin/mailqueue/util.py index 0799665..44fdd16 100644 --- a/hamnadmin/hamnadmin/mailqueue/util.py +++ b/hamnadmin/hamnadmin/mailqueue/util.py @@ -1,11 +1,11 @@ from email.mime.text import MIMEText from email.mime.multipart import MIMEMultipart from email.mime.nonmultipart import MIMENonMultipart -from email.Utils import formatdate, formataddr +from email.utils import formatdate, formataddr from email.header import Header from email import encoders -from models import QueuedMail +from .models import QueuedMail def _encoded_email_header(name, email): if name: diff --git a/hamnadmin/hamnadmin/register/feeds.py b/hamnadmin/hamnadmin/register/feeds.py index 871b005..83e4c3c 100644 --- a/hamnadmin/hamnadmin/register/feeds.py +++ b/hamnadmin/hamnadmin/register/feeds.py @@ -2,7 +2,7 @@ from django.contrib.syndication.views import Feed from hamnadmin.util.html import TruncateAndClean -from models import Post +from .models import Post class PostFeed(Feed): title = 'Planet PostgreSQL' diff --git a/hamnadmin/hamnadmin/register/forms.py b/hamnadmin/hamnadmin/register/forms.py index e45f7d9..da4cb2f 100644 --- a/hamnadmin/hamnadmin/register/forms.py +++ b/hamnadmin/hamnadmin/register/forms.py @@ -3,11 +3,11 @@ from django.contrib import messages from django.core.validators import MinLengthValidator from django.conf import settings -from models import Blog +from .models import Blog from hamnadmin.util.aggregate import FeedFetcher, ParserGotRedirect -import urllib +import urllib.request, urllib.parse, urllib.error import requests import requests_oauthlib diff --git a/hamnadmin/hamnadmin/register/migrations/0001_initial.py b/hamnadmin/hamnadmin/register/migrations/0001_initial.py index 0dfbcf6..a5a61e4 100644 --- a/hamnadmin/hamnadmin/register/migrations/0001_initial.py +++ b/hamnadmin/hamnadmin/register/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models import datetime diff --git a/hamnadmin/hamnadmin/register/migrations/0002_cleanup_models.py b/hamnadmin/hamnadmin/register/migrations/0002_cleanup_models.py index 0104c10..595ebba 100644 --- a/hamnadmin/hamnadmin/register/migrations/0002_cleanup_models.py +++ b/hamnadmin/hamnadmin/register/migrations/0002_cleanup_models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py b/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py index cf98931..c7a0435 100644 --- a/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py +++ b/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models from django.conf import settings diff --git a/hamnadmin/hamnadmin/register/migrations/0004_archived_blogs.py b/hamnadmin/hamnadmin/register/migrations/0004_archived_blogs.py index 5095ba3..4db589a 100644 --- a/hamnadmin/hamnadmin/register/migrations/0004_archived_blogs.py +++ b/hamnadmin/hamnadmin/register/migrations/0004_archived_blogs.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py b/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py index 7728e38..ef57a12 100644 --- a/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py +++ b/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations, models from django.conf import settings diff --git a/hamnadmin/hamnadmin/register/views.py b/hamnadmin/hamnadmin/register/views.py index 5c3702d..9d6b4f3 100644 --- a/hamnadmin/hamnadmin/register/views.py +++ b/hamnadmin/hamnadmin/register/views.py @@ -15,7 +15,7 @@ from hamnadmin.util.varnish import purge_url, purge_root_and_feeds import datetime import feedparser -from forms import BlogEditForm, ModerateRejectForm +from .forms import BlogEditForm, ModerateRejectForm # Public planet def planet_home(request): diff --git a/hamnadmin/hamnadmin/settings.py b/hamnadmin/hamnadmin/settings.py index 05cd52a..dff2726 100644 --- a/hamnadmin/hamnadmin/settings.py +++ b/hamnadmin/hamnadmin/settings.py @@ -85,8 +85,8 @@ MAX_SAFE_ENTRIES_PER_FETCH=4 # Dynamically load settings from the "outer" planet.ini that might # be needed. try: - import ConfigParser - _configparser = ConfigParser.ConfigParser() + import configparser + _configparser = configparser.ConfigParser() _configparser.read(os.path.join(os.path.abspath(os.path.dirname(__file__)), '../../planet.ini')) TWITTER_CLIENT=_configparser.get('twitter', 'consumer') TWITTER_CLIENTSECRET=_configparser.get('twitter', 'consumersecret') @@ -100,7 +100,7 @@ except: # If there is a local_settings.py, let it override our settings try: - from local_settings import * + from .local_settings import * except: pass diff --git a/hamnadmin/hamnadmin/util/aggregate.py b/hamnadmin/hamnadmin/util/aggregate.py index 81f8c69..06efc44 100644 --- a/hamnadmin/hamnadmin/util/aggregate.py +++ b/hamnadmin/hamnadmin/util/aggregate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import datetime import socket diff --git a/hamnadmin/hamnadmin/util/html.py b/hamnadmin/hamnadmin/util/html.py index 299db2e..b5c45b3 100644 --- a/hamnadmin/hamnadmin/util/html.py +++ b/hamnadmin/hamnadmin/util/html.py @@ -1,6 +1,6 @@ -from HTMLParser import HTMLParser +from html.parser import HTMLParser import tidy -import urllib +import urllib.parse _tidyopts = dict( drop_proprietary_attributes=1, alt_text='', @@ -50,7 +50,7 @@ class HtmlTruncator(HTMLParser): if len(p) < 2: # Don't crash on invalid URLs return "" - return p[0] + ":" + urllib.quote(p[1]) + return p[0] + ":" + urllib.parse.quote(p[1]) def cleanhref(self, attrs): if attrs[0] == 'href': diff --git a/hamnadmin/hamnadmin/util/varnish.py b/hamnadmin/hamnadmin/util/varnish.py index 88e87b3..e84e51f 100644 --- a/hamnadmin/hamnadmin/util/varnish.py +++ b/hamnadmin/hamnadmin/util/varnish.py @@ -1,6 +1,6 @@ from django.conf import settings -import urllib2 +import urllib.request, urllib.error, urllib.parse def purge_url(url): if not settings.VARNISH_URL: diff --git a/hamnadmin/manage.py b/hamnadmin/manage.py index 12f182b..1247d20 100755 --- a/hamnadmin/manage.py +++ b/hamnadmin/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys diff --git a/listsync.py b/listsync.py index b234d92..94d0fcf 100755 --- a/listsync.py +++ b/listsync.py @@ -1,20 +1,20 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Planet PostgreSQL - list synchronizer This file contains the functions to synchronize the list of subscribers to planet with those of a pglister mailinglist. -Copyright (C) 2008-2017PostgreSQL Global Development Group +Copyright (C) 2008-2017 PostgreSQL Global Development Group """ import sys -import ConfigParser +import configparser import psycopg2 import requests if __name__=="__main__": - c = ConfigParser.ConfigParser() + c = configparser.ConfigParser() c.read('planet.ini') conn = psycopg2.connect(c.get('planet', 'db')) diff --git a/posttotwitter.py b/posttotwitter.py index 66455e3..4ec7621 100755 --- a/posttotwitter.py +++ b/posttotwitter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: ai ts=4 sts=4 sw=4 """PostgreSQL Planet Aggregator @@ -12,9 +12,8 @@ Copyright (C) 2009-2019 PostgreSQL Global Development Group import psycopg2 import psycopg2.extensions -import urllib import simplejson as json -import ConfigParser +import configparser from twitterclient import TwitterClient @@ -114,7 +113,7 @@ class PostToTwitter(TwitterClient): if __name__=="__main__": - c = ConfigParser.ConfigParser() + c = configparser.ConfigParser() c.read('planet.ini') PostToTwitter(c).Run() diff --git a/setuptwitter.py b/setuptwitter.py index 27787be..77e36ba 100755 --- a/setuptwitter.py +++ b/setuptwitter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: ai ts=4 sts=4 sw=4 """PostgreSQL Planet Aggregator @@ -10,10 +10,10 @@ Copyright (C) 2010 PostgreSQL Global Development Group import sys import cgi -import ConfigParser +import configparser import requests_oauthlib -cfg = ConfigParser.ConfigParser() +cfg = configparser.ConfigParser() cfg.read('planet.ini') if not cfg.has_option('twitter', 'consumer') or not cfg.has_option('twitter', 'consumersecret'): diff --git a/synctwitter.py b/synctwitter.py index 198c0c4..3b91961 100755 --- a/synctwitter.py +++ b/synctwitter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: ai ts=4 sts=4 sw=4 """PostgreSQL Planet Aggregator @@ -10,7 +10,7 @@ Copyright (C) 2009-2019 PostgreSQL Global Development Group import psycopg2 import psycopg2.extensions -import ConfigParser +import configparser from twitterclient import TwitterClient class SyncTwitter(TwitterClient): @@ -50,6 +50,6 @@ class SyncTwitter(TwitterClient): if __name__=="__main__": - c = ConfigParser.ConfigParser() + c = configparser.ConfigParser() c.read('planet.ini') SyncTwitter(c).Run() diff --git a/twitterclient.py b/twitterclient.py index 76a101f..a47c758 100644 --- a/twitterclient.py +++ b/twitterclient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vim: ai ts=4 sts=4 sw=4 """PostgreSQL Planet Aggregator |