From 282eb5d737913c8b39e1f1b90d09004a032457a3 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 23 Feb 2017 11:19:57 -0500 Subject: [PATCH 1/2] Remove unused imports and assigned exceptions --- locust/clients.py | 1 - locust/core.py | 1 - locust/rpc/socketrpc.py | 7 +++---- locust/test/test_client.py | 1 - locust/test/test_locust_class.py | 1 - locust/test/test_main.py | 4 +--- locust/test/test_runners.py | 4 ++-- locust/test/test_stats.py | 3 +-- locust/test/test_web.py | 1 - setup.py | 4 ++-- 10 files changed, 9 insertions(+), 18 deletions(-) diff --git a/locust/clients.py b/locust/clients.py index c586496d54..1ef13a5f60 100644 --- a/locust/clients.py +++ b/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 diff --git a/locust/core.py b/locust/core.py index 07f36e3186..7f0a117bf6 100644 --- a/locust/core.py +++ b/locust/core.py @@ -8,7 +8,6 @@ from time import time import sys import random -import warnings import traceback import logging diff --git a/locust/rpc/socketrpc.py b/locust/rpc/socketrpc.py index d083c80942..034efe6ff7 100644 --- a/locust/rpc/socketrpc.py +++ b/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: diff --git a/locust/test/test_client.py b/locust/test/test_client.py index 712e3c1fb3..d76630bcf4 100644 --- a/locust/test/test_client.py +++ b/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 diff --git a/locust/test/test_locust_class.py b/locust/test/test_locust_class.py index a2ffca772b..6b448196d1 100644 --- a/locust/test/test_locust_class.py +++ b/locust/test/test_locust_class.py @@ -1,4 +1,3 @@ -import unittest import six from locust.core import HttpLocust, Locust, TaskSet, task, events diff --git a/locust/test/test_main.py b/locust/test/test_main.py index d2b1f5578c..902ecde8ff 100644 --- a/locust/test/test_main.py +++ b/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): diff --git a/locust/test/test_runners.py b/locust/test/test_runners.py index b2b5ac14f2..31bbeae697 100644 --- a/locust/test/test_runners.py +++ b/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 diff --git a/locust/test/test_stats.py b/locust/test/test_stats.py index ff8bcd2ec9..41784f2fed 100644 --- a/locust/test/test_stats.py +++ b/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 diff --git a/locust/test/test_web.py b/locust/test/test_web.py index f24c29d6a2..16d95270ea 100644 --- a/locust/test/test_web.py +++ b/locust/test/test_web.py @@ -7,7 +7,6 @@ from six.moves import StringIO import requests -import mock import gevent from gevent import wsgi diff --git a/setup.py b/setup.py index 9425ad05ef..5336d81172 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # encoding: utf-8 -from setuptools import setup, find_packages, Command -import sys, os, re, ast +from setuptools import setup, find_packages +import os, re, ast # parse version from locust/__init__.py From 675b4e0401b1f930ad1ce267356e7aff88e454e1 Mon Sep 17 00:00:00 2001 From: Mark Beacom Date: Thu, 23 Feb 2017 13:15:32 -0500 Subject: [PATCH 2/2] Remove additional unused imports #552 --- examples/custom_xmlrpc_client/server.py | 1 - locust/test/test_locust_class.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/custom_xmlrpc_client/server.py b/examples/custom_xmlrpc_client/server.py index b2e8bd684a..536c5852fa 100644 --- a/examples/custom_xmlrpc_client/server.py +++ b/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()) diff --git a/locust/test/test_locust_class.py b/locust/test/test_locust_class.py index 6b448196d1..f2da60a275 100644 --- a/locust/test/test_locust_class.py +++ b/locust/test/test_locust_class.py @@ -402,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):