XenoRyet has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373936 )
Change subject: Be explicit with imports ...................................................................... Be explicit with imports Not using the full namespace as might be desired, but avoiding import * Will help pass flake8 Bug: T121723 Change-Id: I73fbb1781150715f78216aaec5a61d4fcac21bda --- M fundraiser/analytics/management/commands/AggregateBannerImpressions.py M fundraiser/analytics/management/commands/LoadBannerImpressions.py M fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py M fundraiser/analytics/management/commands/LoadLPImpressions.py 4 files changed, 10 insertions(+), 14 deletions(-) Approvals: Mepps: Looks good to me, approved XenoRyet: Verified diff --git a/fundraiser/analytics/management/commands/AggregateBannerImpressions.py b/fundraiser/analytics/management/commands/AggregateBannerImpressions.py index 3895efa..352741e 100644 --- a/fundraiser/analytics/management/commands/AggregateBannerImpressions.py +++ b/fundraiser/analytics/management/commands/AggregateBannerImpressions.py @@ -9,9 +9,7 @@ import _mysql_exceptions from optparse import make_option -from fundraiser.analytics.functions import * -from fundraiser.analytics.models import * -from fundraiser.analytics.regex import * +from fundraiser.analytics.functions import get_language, get_project, roundtime, lookup_project, lookup_language class Command(BaseCommand): diff --git a/fundraiser/analytics/management/commands/LoadBannerImpressions.py b/fundraiser/analytics/management/commands/LoadBannerImpressions.py index 11d0752..2aaf679 100644 --- a/fundraiser/analytics/management/commands/LoadBannerImpressions.py +++ b/fundraiser/analytics/management/commands/LoadBannerImpressions.py @@ -13,9 +13,9 @@ import os import urlparse -from fundraiser.analytics.functions import * -from fundraiser.analytics.models import * -from fundraiser.analytics.regex import * +from fundraiser.analytics.functions import lookup_country, lookup_language, lookup_project, lookup_squidhost +from fundraiser.analytics.models import SquidLog +from fundraiser.analytics.regex import ignore_uas, phantomJS, sampled, squidline from django.conf import settings diff --git a/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py b/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py index f3d2204..c643207 100644 --- a/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py +++ b/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py @@ -1,6 +1,5 @@ from django.core.management.base import BaseCommand from django.db import connections, transaction, reset_queries -from django.db.utils import IntegrityError import gc from datetime import datetime, timedelta @@ -14,10 +13,9 @@ import os import urlparse -# TODO: import NAME instead, so usage includes the full namespace. -from fundraiser.analytics.functions import * -from fundraiser.analytics.models import * -from fundraiser.analytics.regex import * +from fundraiser.analytics.functions import lookup_country, lookup_project, lookup_language, roundtime +from fundraiser.analytics.models import SquidLog +from fundraiser.analytics.regex import ignore_uas, phantomJS, sampled, squidline from django.conf import settings diff --git a/fundraiser/analytics/management/commands/LoadLPImpressions.py b/fundraiser/analytics/management/commands/LoadLPImpressions.py index ee25633..1c116c3 100644 --- a/fundraiser/analytics/management/commands/LoadLPImpressions.py +++ b/fundraiser/analytics/management/commands/LoadLPImpressions.py @@ -14,9 +14,9 @@ from urllib import unquote import urlparse -from fundraiser.analytics.functions import * -from fundraiser.analytics.models import * -from fundraiser.analytics.regex import * +from fundraiser.analytics.functions import lookup_country, lookup_language, lookup_project, lookup_squidhost +from fundraiser.analytics.models import LandingPageImpression, SquidLog +from fundraiser.analytics.regex import ignore_uas, landingpages, squidline from django.conf import settings -- To view, visit https://gerrit.wikimedia.org/r/373936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73fbb1781150715f78216aaec5a61d4fcac21bda Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/fundraising/tools/DjangoBannerStats Gerrit-Branch: master Gerrit-Owner: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Mepps <me...@wikimedia.org> Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
