Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanups (deprecated code, unused imports) #88

Merged
merged 2 commits into from
Aug 20, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions locust/clients.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import re
import time
import socket
from collections import namedtuple
from urlparse import urlparse, urlunparse

import requests
from requests import Response, Request
from requests.packages.urllib3.response import HTTPResponse
from requests.auth import HTTPBasicAuth
from requests.exceptions import (RequestException, ConnectionError, HTTPError,
MissingSchema, InvalidSchema, InvalidURL)
from requests.exceptions import (RequestException, MissingSchema,
InvalidSchema, InvalidURL)

import events
from exception import CatchResponseError, ResponseError
Expand Down
4 changes: 1 addition & 3 deletions locust/runners.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
from gevent.pool import Group

import events
from locust.stats import print_percentile_stats
from stats import RequestStats, print_stats, global_stats
from exception import RescheduleTaskImmediately
from stats import global_stats

from rpc import rpc, Message

Expand Down
1 change: 0 additions & 1 deletion locust/stats.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import time
import gevent
import hashlib
from copy import copy

import events
from exception import StopLocust
Expand Down
15 changes: 0 additions & 15 deletions locust/test/runtests.py

This file was deleted.

1 change: 0 additions & 1 deletion locust/test/test_client.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import unittest
from requests.exceptions import (RequestException, MissingSchema,
InvalidSchema, InvalidURL)

Expand Down
2 changes: 1 addition & 1 deletion locust/test/testcases.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from StringIO import StringIO

from locust import events
from locust.stats import RequestStats, global_stats
from locust.stats import global_stats
from flask import Flask, request, redirect, make_response, send_file

app = Flask(__name__)
Expand Down