Remove unused imports (locustio#552)

* Remove unused imports and assigned exceptions * Remove additional unused imports locustio#552

Author: Mark Beacom

examples/custom_xmlrpc_client/server.py

@@ -1,7 +1,6 @@
 import time
 import random
 from SimpleXMLRPCServer import SimpleXMLRPCServer
-import xmlrpclib
 
 def get_time():
  time.sleep(random.random())

locust/clients.py

@@ -1,6 +1,5 @@
 import re
 import time
-from datetime import timedelta
 from six.moves.urllib.parse import urlparse, urlunparse
 import six
 

locust/core.py

@@ -8,7 +8,6 @@
 from time import time
 import sys
 import random
-import warnings
 import traceback
 import logging
 

locust/rpc/socketrpc.py

@@ -3,7 +3,6 @@
 
 import gevent
 from gevent import socket
-from gevent import queue
 
 from locust.exception import LocustError
 from .protocol import Message
@@ -25,7 +24,7 @@ def _send_obj(sock, msg):
  packed = struct.pack('!i', len(data)) + data
  try:
  sock.sendall(packed)
- except Exception as e:
+ except Exception:
  try:
  sock.close()
  except:
@@ -52,7 +51,7 @@ def handle():
  try:
  while True:
  self.command_queue.put_nowait(_recv_obj(sock))
- except Exception as e:
+ except Exception:
  try:
  sock.close()
  except:
@@ -99,7 +98,7 @@ def handle_slave(sock):
  try:
  while True:
  self.event_queue.put_nowait(_recv_obj(sock))
- except Exception as e:
+ except Exception:
  logger.info("Slave disconnected")
  slaves.remove(sock)
  if self.slave_index == len(slaves) and len(slaves) > 0:

locust/test/test_client.py

@@ -1,7 +1,6 @@
 from requests.exceptions import (RequestException, MissingSchema,
  InvalidSchema, InvalidURL)
 
-import gevent
 from locust.clients import HttpSession
 from locust.stats import global_stats
 from .testcases import WebserverTestCase

locust/test/test_locust_class.py

@@ -1,4 +1,3 @@
-import unittest
 import six
 
 from locust.core import HttpLocust, Locust, TaskSet, task, events
@@ -403,7 +402,7 @@ class MyUnauthorizedLocust(HttpLocust):
  self.assertEqual(401, unauthorized.client.get("/basic_auth").status_code)
 
  def test_log_request_name_argument(self):
- from locust.stats import RequestStats, global_stats
+ from locust.stats import global_stats
  self.response = ""
 
  class MyLocust(HttpLocust):

locust/test/test_main.py

@@ -1,8 +1,6 @@
-import unittest
-
 from locust.core import HttpLocust, Locust, TaskSet
 from locust import main
-from .testcases import LocustTestCase, WebserverTestCase
+from .testcases import LocustTestCase
 
 class TestTaskSet(LocustTestCase):
  def test_is_locust(self):

locust/test/test_runners.py

@@ -6,11 +6,11 @@
 from gevent.queue import Queue
 from gevent import sleep
 
-from locust.runners import LocalLocustRunner, MasterLocustRunner, SlaveLocustRunner
+from locust.runners import LocalLocustRunner, MasterLocustRunner
 from locust.core import Locust, task, TaskSet
 from locust.exception import LocustError
 from locust.rpc import Message
-from locust.stats import RequestStats, global_stats
+from locust.stats import global_stats
 from locust.main import parse_options
 from locust.test.testcases import LocustTestCase
 from locust import events

locust/test/test_stats.py

@@ -1,12 +1,11 @@
 import unittest
 import time
 
-from requests.exceptions import RequestException
 from six.moves import xrange
 
 from .testcases import WebserverTestCase
 from locust.stats import RequestStats, StatsEntry, global_stats
-from locust.core import HttpLocust, Locust, TaskSet, task
+from locust.core import HttpLocust, TaskSet, task
 from locust.inspectlocust import get_task_ratio_dict
 from locust.rpc.protocol import Message
 

locust/test/test_web.py

@@ -7,7 +7,6 @@
 from six.moves import StringIO
 
 import requests
-import mock
 import gevent
 from gevent import wsgi