Update syntax for relative imports

pgweb/account/admin.py

@@ -6,7 +6,7 @@ from django import forms
 
 import base64
 
-from models import CommunityAuthSite, CommunityAuthOrg
+from .models import CommunityAuthSite, CommunityAuthOrg
 
 
 class CommunityAuthSiteAdminForm(forms.ModelForm):

pgweb/account/forms.py

@@ -7,7 +7,7 @@ from django.contrib.auth.models import User
 from pgweb.core.models import UserProfile
 from pgweb.contributors.models import Contributor
 
-from recaptcha import ReCaptchaField
+from .recaptcha import ReCaptchaField
 
 import logging
 log = logging.getLogger(__name__)

pgweb/account/views.py

@@ -32,12 +32,12 @@ from pgweb.contributors.models import Contributor
 from pgweb.downloads.models import Product
 from pgweb.profserv.models import ProfessionalService
 
-from models import CommunityAuthSite, CommunityAuthConsent, EmailChangeToken
-from forms import PgwebAuthenticationForm
-from forms import CommunityAuthConsentForm
-from forms import SignupForm, SignupOauthForm
-from forms import UserForm, UserProfileForm, ContributorForm
-from forms import ChangeEmailForm, PgwebPasswordResetForm
+from .models import CommunityAuthSite, CommunityAuthConsent, EmailChangeToken
+from .forms import PgwebAuthenticationForm
+from .forms import CommunityAuthConsentForm
+from .forms import SignupForm, SignupOauthForm
+from .forms import UserForm, UserProfileForm, ContributorForm
+from .forms import ChangeEmailForm, PgwebPasswordResetForm
 
 import logging
 log = logging.getLogger(__name__)

pgweb/contributors/admin.py

@@ -5,7 +5,7 @@ from selectable.forms.widgets import AutoCompleteSelectWidget
 
 from pgweb.core.lookups import UserLookup
 
-from models import Contributor, ContributorType
+from .models import Contributor, ContributorType
 
 
 class ContributorAdminForm(forms.ModelForm):

pgweb/contributors/views.py

@@ -1,6 +1,6 @@
 from pgweb.util.contexts import render_pgweb
 
-from models import ContributorType
+from .models import ContributorType
 
 
 def completelist(request):

pgweb/core/feeds.py

@@ -1,6 +1,6 @@
 from django.contrib.syndication.views import Feed
 
-from models import Version
+from .models import Version
 
 from datetime import datetime, time
 

pgweb/core/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.forms import ValidationError
 
-from models import Organisation
+from .models import Organisation
 from django.contrib.auth.models import User
 
 

pgweb/core/views.py

@@ -28,14 +28,14 @@ from pgweb.util.sitestruct import get_all_pages_struct
 from pgweb.news.models import NewsArticle, NewsTag
 from pgweb.events.models import Event
 from pgweb.quotes.models import Quote
-from models import Version, ImportedRSSItem
+from .models import Version, ImportedRSSItem
 
 # models needed for the pieces on the community page
 from pgweb.survey.models import Survey
 
 # models and forms needed for core objects
-from models import Organisation
-from forms import OrganisationForm, MergeOrgsForm
+from .models import Organisation
+from .forms import OrganisationForm, MergeOrgsForm
 
 
 # Front page view

pgweb/docs/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
 
-from models import DocPageAlias
+from .models import DocPageAlias
 
 admin.site.register(DocPageAlias)

pgweb/docs/views.py

@@ -14,8 +14,8 @@ from pgweb.util.misc import send_template_mail
 
 from pgweb.core.models import Version
 
-from models import DocPage
-from forms import DocCommentForm
+from .models import DocPage
+from .forms import DocCommentForm
 
 
 @allow_frames

pgweb/downloads/admin.py

@@ -5,7 +5,7 @@ from django.forms import ValidationError
 import re
 
 from pgweb.util.admin import PgwebAdmin
-from models import StackBuilderApp, Category, Product, LicenceType
+from .models import StackBuilderApp, Category, Product, LicenceType
 
 
 class ProductAdmin(PgwebAdmin):

pgweb/downloads/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 
 from pgweb.core.models import Organisation
-from models import Product
+from .models import Product
 
 
 class ProductForm(forms.ModelForm):

pgweb/downloads/struct.py

@@ -1,4 +1,4 @@
-from models import Category
+from .models import Category
 
 
 def get_struct():

pgweb/downloads/views.py

@@ -14,8 +14,8 @@ from pgweb.util.helpers import simple_form, PgXmlHelper, HttpServerError
 from pgweb.util.misc import varnish_purge, version_sort
 
 from pgweb.core.models import Version
-from models import Category, Product, StackBuilderApp
-from forms import ProductForm
+from .models import Category, Product, StackBuilderApp
+from .forms import ProductForm
 
 
 #######

pgweb/events/admin.py

@@ -2,7 +2,7 @@ from django.contrib import admin
 from django import forms
 
 from pgweb.util.admin import PgwebAdmin
-from models import Event
+from .models import Event
 
 
 def approve_event(modeladmin, request, queryset):

pgweb/events/feeds.py

@@ -1,6 +1,6 @@
 from django.contrib.syndication.views import Feed
 
-from models import Event
+from .models import Event
 
 from datetime import datetime, time
 

pgweb/events/forms.py

@@ -2,7 +2,7 @@ from django import forms
 from django.forms import ValidationError
 
 from pgweb.core.models import Organisation
-from models import Event
+from .models import Event
 
 
 class EventForm(forms.ModelForm):

pgweb/events/struct.py

@@ -1,5 +1,5 @@
 from datetime import date
-from models import Event
+from .models import Event
 
 
 def get_struct():

pgweb/events/views.py

@@ -7,8 +7,8 @@ from datetime import date
 from pgweb.util.contexts import render_pgweb
 from pgweb.util.helpers import simple_form
 
-from models import Event
-from forms import EventForm
+from .models import Event
+from .forms import EventForm
 
 
 def main(request):

pgweb/featurematrix/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from models import Feature, FeatureGroup
+from .models import Feature, FeatureGroup
 
 
 class FeatureInline(admin.TabularInline):

pgweb/featurematrix/views.py

@@ -3,7 +3,7 @@ from django.shortcuts import get_object_or_404
 from pgweb.util.contexts import render_pgweb
 
 from pgweb.core.models import Version
-from models import Feature
+from .models import Feature
 
 
 def root(request):

pgweb/lists/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import MailingList, MailingListGroup
+from .models import MailingList, MailingListGroup
 
 admin.site.register(MailingListGroup)
 admin.site.register(MailingList)

pgweb/lists/views.py

@@ -2,7 +2,7 @@ from django.http import HttpResponse
 
 import json
 
-from models import MailingList, MailingListGroup
+from .models import MailingList, MailingListGroup
 
 
 def listinfo(request):

pgweb/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):

pgweb/mailqueue/util.py

@@ -6,7 +6,7 @@ from email.Utils import make_msgid
 from email import encoders
 from email.header import Header
 
-from models import QueuedMail
+from .models import QueuedMail
 
 
 def _encoded_email_header(name, email):

pgweb/misc/views.py

@@ -15,7 +15,7 @@ from pgweb.util.misc import send_template_mail
 from pgweb.core.models import Version
 from pgweb.misc.models import BugIdMap
 
-from forms import SubmitBugForm
+from .forms import SubmitBugForm
 
 
 def _make_bugs_messageid(bugid):

pgweb/news/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from pgweb.util.admin import PgwebAdmin
-from models import NewsArticle, NewsTag
+from .models import NewsArticle, NewsTag
 
 
 class NewsArticleAdmin(PgwebAdmin):

pgweb/news/feeds.py

@@ -1,6 +1,6 @@
 from django.contrib.syndication.views import Feed
 
-from models import NewsArticle
+from .models import NewsArticle
 
 from datetime import datetime, time
 

pgweb/news/forms.py

@@ -2,7 +2,7 @@ from django import forms
 from django.forms import ValidationError
 
 from pgweb.core.models import Organisation
-from models import NewsArticle, NewsTag
+from .models import NewsArticle, NewsTag
 
 
 class NewsArticleForm(forms.ModelForm):

pgweb/news/struct.py

@@ -1,5 +1,5 @@
 from datetime import date, timedelta
-from models import NewsArticle
+from .models import NewsArticle
 
 
 def get_struct():

pgweb/news/views.py

@@ -5,8 +5,8 @@ from pgweb.util.decorators import login_required
 from pgweb.util.contexts import render_pgweb
 from pgweb.util.helpers import simple_form
 
-from models import NewsArticle, NewsTag
-from forms import NewsArticleForm
+from .models import NewsArticle, NewsTag
+from .forms import NewsArticleForm
 
 import json
 

pgweb/profserv/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from pgweb.util.admin import PgwebAdmin
-from models import ProfessionalService
+from .models import ProfessionalService
 
 
 class ProfessionalServiceAdmin(PgwebAdmin):

pgweb/profserv/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 
 from pgweb.core.models import Organisation
-from models import ProfessionalService
+from .models import ProfessionalService
 
 
 class ProfessionalServiceForm(forms.ModelForm):

pgweb/profserv/struct.py

@@ -1,4 +1,4 @@
-from views import regions
+from .views import regions
 
 
 def get_struct():

pgweb/profserv/views.py

@@ -4,8 +4,8 @@ from pgweb.util.decorators import login_required
 from pgweb.util.contexts import render_pgweb
 from pgweb.util.helpers import simple_form
 
-from models import ProfessionalService
-from forms import ProfessionalServiceForm
+from .models import ProfessionalService
+from .forms import ProfessionalServiceForm
 
 regions = (
     ('africa', 'Africa'),

pgweb/pugs/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 from pgweb.util.admin import PgwebAdmin
-from models import PUG
+from .models import PUG
 
 
 class PUGAdmin(PgwebAdmin):

pgweb/pugs/views.py

@@ -1,6 +1,6 @@
 from pgweb.util.contexts import render_pgweb
 
-from models import PUG
+from .models import PUG
 
 
 def index(request):

pgweb/quotes/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Quote
+from .models import Quote
 
 
 class QuoteAdmin(admin.ModelAdmin):

pgweb/security/admin.py

@@ -4,7 +4,7 @@ from django.conf import settings
 
 from pgweb.core.models import Version
 from pgweb.news.models import NewsArticle
-from models import SecurityPatch, SecurityPatchVersion
+from .models import SecurityPatch, SecurityPatchVersion
 
 
 class VersionChoiceField(forms.ModelChoiceField):

pgweb/security/views.py

@@ -3,7 +3,7 @@ from django.shortcuts import get_object_or_404
 from pgweb.util.contexts import render_pgweb
 
 from pgweb.core.models import Version
-from models import SecurityPatch
+from .models import SecurityPatch
 
 
 def GetPatchesList(filt):

pgweb/settings.py

@@ -162,4 +162,4 @@ OAUTH = {}                                                  # OAuth providers an
 PGDG_ORG_ID = -1                                            # id of the PGDG organisation entry
 
 # Load local settings overrides
-from settings_local import *
+from .settings_local import *

pgweb/sponsors/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Sponsor, SponsorType, Server
+from .models import Sponsor, SponsorType, Server
 
 admin.site.register(SponsorType)
 admin.site.register(Sponsor)

pgweb/sponsors/views.py

@@ -1,7 +1,7 @@
 from pgweb.util.contexts import render_pgweb
 from pgweb.util.decorators import cache
 
-from models import Sponsor, Server
+from .models import Sponsor, Server
 
 
 @cache(minutes=30)

pgweb/survey/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from models import Survey, SurveyLock, SurveyAnswer
+from .models import Survey, SurveyLock, SurveyAnswer
 
 
 class SurveyAdmin(admin.ModelAdmin):

pgweb/survey/views.py

@@ -8,7 +8,7 @@ from pgweb.util.contexts import render_pgweb
 from pgweb.util.misc import get_client_ip, varnish_purge
 from pgweb.util.helpers import HttpServerError
 
-from models import Survey, SurveyAnswer, SurveyLock
+from .models import Survey, SurveyAnswer, SurveyLock
 
 
 def results(request, surveyid, junk=None):

tools/search/crawler/lib/genericsite.py

@@ -1,7 +1,7 @@
 import re
 
-from basecrawler import BaseSiteCrawler
-from parsers import RobotsParser
+from .basecrawler import BaseSiteCrawler
+from .parsers import RobotsParser
 
 
 class GenericSiteCrawler(BaseSiteCrawler):