Replace wildcard imports with explicit ones

19 files changed, 22 insertions, 20 deletions

diff --git a/pgweb/account/admin.py b/pgweb/account/admin.py
index e979242b..41c47147 100644
--- a/pgweb/account/admin.py
+++ b/pgweb/account/admin.py
@@ -3,7 +3,7 @@ from django import forms
 
 import base64
 
-from models import *
+from models import CommunityAuthSite
 
 class CommunityAuthSiteAdminForm(forms.ModelForm):
 	class Meta:
diff --git a/pgweb/contributors/admin.py b/pgweb/contributors/admin.py
index c8f6baae..f1824053 100644
--- a/pgweb/contributors/admin.py
+++ b/pgweb/contributors/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import *
+from models import Contributor, ContributorType
 
 admin.site.register(ContributorType)
 admin.site.register(Contributor)
diff --git a/pgweb/core/admin.py b/pgweb/core/admin.py
index 9a9c7957..a010b143 100644
--- a/pgweb/core/admin.py
+++ b/pgweb/core/admin.py
@@ -1,6 +1,8 @@
 from django.contrib import admin
 
-from pgweb.core.models import *
+from pgweb.core.models import Version, OrganisationType, Organisation
+from pgweb.core.models import ImportedRSSFeed, ImportedRSSItem
+from pgweb.core.models import ModerationNotification
 
 class OrganisationAdmin(admin.ModelAdmin):
 	list_display = ('name', 'approved', 'lastconfirmed',)
diff --git a/pgweb/docs/admin.py b/pgweb/docs/admin.py
index d75971b1..56ca3c4d 100644
--- a/pgweb/docs/admin.py
+++ b/pgweb/docs/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import *
+from models import DocComment
 
 def approve_doccomment(modeladmin, request, queryset):
 	# We need to do this in a loop even though it's less efficient,
diff --git a/pgweb/downloads/admin.py b/pgweb/downloads/admin.py
index e395e7c9..81fa05c7 100644
--- a/pgweb/downloads/admin.py
+++ b/pgweb/downloads/admin.py
@@ -5,7 +5,7 @@ from django.forms import ValidationError
 import re
 
 from util.admin import PgwebAdmin
-from models import *
+from models import StackBuilderApp, Mirror, Category, Product, LicenceType
 
 class MirrorAdmin(admin.ModelAdmin):
 	list_display = ('__unicode__', 'country_name', 'country_code', 'mirror_index', 'mirror_last_rsync', 'host_sponsor', )
diff --git a/pgweb/downloads/views.py b/pgweb/downloads/views.py
index 5aa50c10..f45da9a1 100644
--- a/pgweb/downloads/views.py
+++ b/pgweb/downloads/views.py
@@ -14,8 +14,8 @@ from pgweb.util.contexts import NavContext
 from pgweb.util.helpers import simple_form, PgXmlHelper, HttpServerError
 from pgweb.util.misc import get_client_ip, varnish_purge
 
-from models import *
-from forms import *
+from models import Mirror, Category, Product, StackBuilderApp
+from forms import ProductForm
 
 #######
 # FTP browser
diff --git a/pgweb/events/admin.py b/pgweb/events/admin.py
index dbf850bd..53a398ad 100644
--- a/pgweb/events/admin.py
+++ b/pgweb/events/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from django import forms
 
 from util.admin import PgwebAdmin
-from models import *
+from models import Event
 
 def approve_event(modeladmin, request, queryset):
 	# We need to do this in a loop even though it's less efficient,
diff --git a/pgweb/featurematrix/admin.py b/pgweb/featurematrix/admin.py
index 6606f76c..4a6be635 100644
--- a/pgweb/featurematrix/admin.py
+++ b/pgweb/featurematrix/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from models import *
+from models import Feature, FeatureGroup
 
 class FeatureInline(admin.TabularInline):
 	model = Feature
diff --git a/pgweb/featurematrix/views.py b/pgweb/featurematrix/views.py
index 72efe073..12a53cd5 100644
--- a/pgweb/featurematrix/views.py
+++ b/pgweb/featurematrix/views.py
@@ -2,7 +2,7 @@ from django.shortcuts import render_to_response, get_object_or_404
 
 from pgweb.util.contexts import NavContext
 
-from models import *
+from models import Feature
 
 def root(request):
 	features = Feature.objects.all().select_related().order_by('group__groupsort', 'group__groupname', 'featurename')
diff --git a/pgweb/lists/admin.py b/pgweb/lists/admin.py
index 7e6576b3..3027b332 100644
--- a/pgweb/lists/admin.py
+++ b/pgweb/lists/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import *
+from models import MailingList, MailingListGroup
 
 admin.site.register(MailingListGroup)
 admin.site.register(MailingList)
diff --git a/pgweb/misc/views.py b/pgweb/misc/views.py
index 4cfed8b2..0c243390 100644
--- a/pgweb/misc/views.py
+++ b/pgweb/misc/views.py
@@ -12,7 +12,7 @@ from pgweb.util.misc import send_template_mail
 
 from pgweb.core.models import Version
 
-from forms import *
+from forms import SubmitBugForm
 
 @csrf_exempt
 def submitbug(request):
diff --git a/pgweb/news/admin.py b/pgweb/news/admin.py
index 04928919..a69ba5e3 100644
--- a/pgweb/news/admin.py
+++ b/pgweb/news/admin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from util.admin import PgwebAdmin
-from models import *
+from models import NewsArticle
 
 class NewsArticleAdmin(PgwebAdmin):
 	list_display = ('title', 'org', 'date', 'approved', )
diff --git a/pgweb/profserv/admin.py b/pgweb/profserv/admin.py
index 56f4f3a5..8cae2fbb 100644
--- a/pgweb/profserv/admin.py
+++ b/pgweb/profserv/admin.py
@@ -1,4 +1,4 @@
 from util.admin import register_pgwebadmin
-from models import *
+from models import ProfessionalService
 
 register_pgwebadmin(ProfessionalService)
diff --git a/pgweb/pugs/admin.py b/pgweb/pugs/admin.py
index a436eed8..be50d687 100644
--- a/pgweb/pugs/admin.py
+++ b/pgweb/pugs/admin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from util.admin import PgwebAdmin
-from models import *
+from models import PUG
 
 class PUGAdmin(PgwebAdmin):
 	list_display = ('title', 'approved', )
diff --git a/pgweb/pwn/admin.py b/pgweb/pwn/admin.py
index 24d4c17c..1f096c23 100644
--- a/pgweb/pwn/admin.py
+++ b/pgweb/pwn/admin.py
@@ -1,4 +1,4 @@
 from util.admin import register_pgwebadmin
-from models import *
+from models import PwnPost
 
 register_pgwebadmin(PwnPost)
diff --git a/pgweb/pwn/views.py b/pgweb/pwn/views.py
index 82d1d4be..10cad895 100644
--- a/pgweb/pwn/views.py
+++ b/pgweb/pwn/views.py
@@ -4,7 +4,7 @@ from pgweb.util.contexts import NavContext
 
 from datetime import date
 
-from models import *
+from models import PwnPost
 
 def index(request):
 	posts = PwnPost.objects.all()
diff --git a/pgweb/quotes/admin.py b/pgweb/quotes/admin.py
index d20e4fa7..8b5ed8cf 100644
--- a/pgweb/quotes/admin.py
+++ b/pgweb/quotes/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import *
+from models import Quote
 
 class QuoteAdmin(admin.ModelAdmin):
 	list_display = ('quote', 'who', 'org', )
diff --git a/pgweb/sponsors/admin.py b/pgweb/sponsors/admin.py
index 52018197..555c4b1d 100644
--- a/pgweb/sponsors/admin.py
+++ b/pgweb/sponsors/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import *
+from models import Sponsor, SponsorType, Server
 
 admin.site.register(SponsorType)
 admin.site.register(Sponsor)
diff --git a/pgweb/survey/admin.py b/pgweb/survey/admin.py
index 6d93b846..47622530 100644
--- a/pgweb/survey/admin.py
+++ b/pgweb/survey/admin.py
@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import *
+from models import Survey, SurveyLock, SurveyAnswer
 
 class SurveyAdmin(admin.ModelAdmin):
 	list_display = ('question','posted','current',)