Skip to content

Commit

Permalink
Removing unused imports #14
Browse files Browse the repository at this point in the history
  • Loading branch information
keithamoss committed Dec 13, 2018
1 parent 7d78121 commit 611d163
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 47 deletions.
2 changes: 1 addition & 1 deletion django/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# issue is really that Django is missing to avoid masking other
# exceptions on Python 2.
try:
import django
import django # noqa
except ImportError:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
Expand Down
1 change: 0 additions & 1 deletion django/scremsong/app/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from django.contrib import admin
from django.contrib.auth.models import User
from django.db import connection
from django.apps import apps
from .models import Profile
from scremsong.util import get_env

Expand Down
6 changes: 2 additions & 4 deletions django/scremsong/app/consumers.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
from asgiref.sync import async_to_sync
from channels.generic.websocket import JsonWebsocketConsumer
import json
from scremsong.app.models import SocialPlatformChoice, Tweets, SocialAssignments, SocialAssignmentStatus, Profile
from django.conf import settings
from scremsong.app.websockets import build_on_connect_data_payload
from scremsong.util import get_env, make_logger
from scremsong.util import make_logger

logger = make_logger(__name__)

Expand All @@ -14,7 +12,7 @@ def connect(self):
self.group_name = 'scremsong_%s' % self.scope['url_route']['kwargs']['group_name']
self.user = self.scope["user"]

if self.user.is_anonymous == False and self.user.is_authenticated:
if self.user.is_anonymous is False and self.user.is_authenticated:
# Join room group
async_to_sync(self.channel_layer.group_add)(
self.group_name,
Expand Down
4 changes: 0 additions & 4 deletions django/scremsong/app/models.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import json
from django.db import models
from django.contrib.postgres.fields import JSONField
from django.contrib.auth.models import User
from django.apps import apps
from model_utils import FieldTracker
from scremsong.util import make_logger
import hashlib
import copy
from enum import Enum
from scremsong.app.social.twitter_utils import apply_tweet_filter_criteria

Expand Down
1 change: 0 additions & 1 deletion django/scremsong/app/reviewers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.contrib.auth.models import User
from django.forms.models import model_to_dict
from scremsong.app.models import SocialAssignments, SocialAssignmentStatus
from scremsong.app.twitter import get_tweets_by_ids
from scremsong.app.serializers import ReviewerUserSerializer, TweetsSerializer, SocialAssignmentSerializer
Expand Down
3 changes: 0 additions & 3 deletions django/scremsong/app/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from django.contrib.auth.models import User
from .models import Profile, SocialColumns, Tweets, SocialAssignments
from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.validators import UniqueTogetherValidator
from urllib.parse import quote_plus


class ProfileSerializer(serializers.HyperlinkedModelSerializer):
Expand Down
2 changes: 1 addition & 1 deletion django/scremsong/app/signals.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.dispatch import receiver
from django.db.models.signals import post_save, pre_save
from django.db.models.signals import post_save
from django.contrib.auth.models import User
from scremsong.app.models import Profile
# from .mailgun import send_new_user_welcome_mail, send_new_user_signed_up_admin_mail, send_new_user_welcome_awaiting_approval_mail, send_new_user_admin_awaiting_approval_mail, send_new_user_approved_mail
Expand Down
9 changes: 1 addition & 8 deletions django/scremsong/app/twitter.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
import tweepy
from scremsong.util import make_logger, get_env
import os
import uuid
import datetime
import pytz
import json
from scremsong.app.models import SocialPlatforms, SocialPlatformChoice, Tweets, SocialColumns
from django.db.models import Q
from scremsong.app.models import SocialPlatforms, SocialPlatformChoice, Tweets
from scremsong.celery import celery_init_tweet_streaming
from scremsong.app.social.columns import get_social_columns
from scremsong.app.social.assignments import get_social_assignments
from scremsong.app.social.twitter_utils import apply_tweet_filter_criteria, column_search_phrase_to_twitter_search_query
from .serializers import SocialColumnsSerializerWithTweetCountSerializer, TweetsSerializer

Expand Down
27 changes: 7 additions & 20 deletions django/scremsong/app/views.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,21 @@
from django.contrib.auth.models import User, AnonymousUser
from django.contrib.auth.models import User
from django.contrib.auth import logout
from django.db.models import Q
from django.http.response import HttpResponse, HttpResponseRedirect, JsonResponse
from django.http.response import HttpResponseRedirect
from django.http import HttpResponseNotFound
from django.core.cache import cache

from rest_framework import viewsets, mixins, status
from rest_framework import viewsets, status
from rest_framework.views import APIView
from rest_framework.decorators import detail_route, list_route
from rest_framework.exceptions import NotFound, ValidationError
from rest_framework.decorators import list_route
from rest_framework.response import Response
from rest_framework.permissions import IsAdminUser, IsAuthenticated
# from .permissions import AllowAnyIfPublicSite, IsAuthenticatedAndApproved, IsMapOwnerOrReadOnly, IsMapOwner, CanViewOrCloneMap

from .serializers import UserSerializer, ProfileSerializer, SocialColumnsSerializer

import time
import copy
import urllib.parse
import json
import csv
from tweepy import TweepError
from scremsong.util import get_env, make_logger
from scremsong.app.twitter import twitter_user_api_auth_stage_1, twitter_user_api_auth_stage_2, get_tweets_for_column, get_tweets_by_ids, fetch_some_tweets
from scremsong.app.serializers import UserSerializer, ProfileSerializer
from scremsong.app.twitter import twitter_user_api_auth_stage_1, twitter_user_api_auth_stage_2, fetch_some_tweets
from scremsong.celery import celery_restart_streaming
from scremsong.app.models import SocialPlatformChoice, Tweets, SocialAssignments, SocialAssignmentStatus, Profile
from scremsong.app import websockets

from channels.layers import get_channel_layer
from asgiref.sync import async_to_sync
from scremsong.util import make_logger

logger = make_logger(__name__)

Expand Down
5 changes: 3 additions & 2 deletions django/scremsong/celery.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from scremsong.util import make_logger
import os
from celery import Celery
from celery.contrib.abortable import AbortableTask, AbortableAsyncResult
from celery.signals import celeryd_init, worker_ready
from time import sleep

Expand Down Expand Up @@ -36,7 +35,7 @@ def celery_init_tweet_streaming():


def celery_kill_running_tasks():
from celery.task.control import inspect, revoke, broadcast
from celery.task.control import inspect, revoke
i = inspect()

for worker_name, tasks in i.active().items():
Expand Down Expand Up @@ -65,6 +64,8 @@ def celery_restart_streaming():

@celeryd_init.connect
def configure_workers(sender=None, conf=None, **kwargs):
from celery.task.control import inspect, broadcast
i = inspect()
logger.info("Starting up Celery worker")

# Stop any running tasks before we try to kill our workers
Expand Down
2 changes: 0 additions & 2 deletions django/scremsong/util.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import itertools
import logging
import os
import time
from math import pow


def make_logger(name):
Expand Down

0 comments on commit 611d163

Please sign in to comment.