From b7244f25838895dff84ab5499c799c01ddc80232 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Sat, 11 Jul 2020 18:24:27 +0200 Subject: [PATCH] Clean up imports Remove unused imports, and stop using "import *" --- hamnadmin/hamnadmin/register/admin.py | 5 ++--- hamnadmin/hamnadmin/register/forms.py | 1 - .../register/management/commands/aggregate_feeds.py | 4 +--- hamnadmin/hamnadmin/register/views.py | 9 +++------ posttotwitter.py | 1 - 5 files changed, 6 insertions(+), 14 deletions(-) diff --git a/hamnadmin/hamnadmin/register/admin.py b/hamnadmin/hamnadmin/register/admin.py index 1efafde..5591a1f 100644 --- a/hamnadmin/hamnadmin/register/admin.py +++ b/hamnadmin/hamnadmin/register/admin.py @@ -1,8 +1,7 @@ from django.contrib import admin -from django import forms -from django.conf import settings -from hamnadmin.register.models import * +from hamnadmin.register.models import Blog, Team, Post, AggregatorLog + class TeamAdmin(admin.ModelAdmin): list_display = ['name', 'manager', 'teamurl'] diff --git a/hamnadmin/hamnadmin/register/forms.py b/hamnadmin/hamnadmin/register/forms.py index b66a582..b8e323f 100644 --- a/hamnadmin/hamnadmin/register/forms.py +++ b/hamnadmin/hamnadmin/register/forms.py @@ -1,6 +1,5 @@ from django import forms from django.contrib import messages -from django.core.validators import MinLengthValidator from django.conf import settings from .models import Blog diff --git a/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py b/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py index 83f614c..075c4aa 100644 --- a/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py +++ b/hamnadmin/hamnadmin/register/management/commands/aggregate_feeds.py @@ -1,9 +1,7 @@ -#from gevent import monkey -#monkey.patch_all() from gevent.threadpool import ThreadPool import gevent -from django.core.management.base import BaseCommand, CommandError +from django.core.management.base import BaseCommand from django.db import transaction from django.db.models import Q from django.conf import settings diff --git a/hamnadmin/hamnadmin/register/views.py b/hamnadmin/hamnadmin/register/views.py index 8312565..cfc937f 100644 --- a/hamnadmin/hamnadmin/register/views.py +++ b/hamnadmin/hamnadmin/register/views.py @@ -1,19 +1,16 @@ -from django.http import HttpResponse, HttpResponseRedirect -from django.template import RequestContext +from django.http import HttpResponseRedirect from django.shortcuts import render, get_object_or_404 from django.contrib.auth.decorators import login_required, user_passes_test from django.conf import settings -from django.core.mail import send_mail from django.db import transaction -from django.db.models import Q, Count, Max +from django.db.models import Count, Max from django.contrib import messages -from hamnadmin.register.models import * +from hamnadmin.register.models import Post, Blog, Team, AggregatorLog, AuditEntry from hamnadmin.mailqueue.util import send_simple_mail from hamnadmin.util.varnish import purge_url, purge_root_and_feeds import datetime -from vendor.feedparser import feedparser from .forms import BlogEditForm, ModerateRejectForm diff --git a/posttotwitter.py b/posttotwitter.py index 18461a2..4911adb 100755 --- a/posttotwitter.py +++ b/posttotwitter.py @@ -12,7 +12,6 @@ Copyright (C) 2009-2019 PostgreSQL Global Development Group import psycopg2 import psycopg2.extensions -import simplejson as json import configparser from twitterclient import TwitterClient -- 2.39.5