X-Git-Url: https://git.webkit.org/?p=WebKit.git;a=blobdiff_plain;f=Tools%2FScripts%2Fwebkitpy%2Fbenchmark_runner%2Fhttp_server_driver%2Fhttp_server%2Ftwisted_http_server.py;h=ed427633f87be41d20b3e97d263b7c0a15483b4f;hp=420a752a83adac45f534c4407c71a17d1ba29c54;hb=7dd987ffc0616037ff79fa67f202c1941cef7c06;hpb=1391d948289b7d4ff8f1979db956875d56bec2e9 diff --git a/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py b/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py index 420a752a83ad..ed427633f87b 100644 --- a/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py +++ b/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py @@ -4,12 +4,14 @@ import argparse import logging import os import sys +from pkg_resources import require, VersionConflict, DistributionNotFound try: + require("Twisted>=15.5.0") import twisted -except ImportError: +except (ImportError, VersionConflict, DistributionNotFound): sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..'))) - from webkitpy.thirdparty.autoinstalled.twisted import twisted + from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted from twisted.web import static, server from twisted.web.resource import Resource