From c7fe4edac368fee13877491c527456d1f79f76ed Mon Sep 17 00:00:00 2001 From: Eric Roman Date: Wed, 15 May 2019 19:07:59 +0000 Subject: [PATCH] Remove //third_party/pyftpdlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The copy in third_party is unused, as .vypthon is already pulling in version 0.7 used by the test server. TBR: rogerta@chromium.org,skyostil@chromium.org,raymes@chromium.org Change-Id: I417a3c3ac581b5b9cfe37d23bbc1ada6515730ef Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1611621 Commit-Queue: Eric Roman Reviewed-by: Sami Kyöstilä Reviewed-by: Matt Menke Reviewed-by: Matt Mueller Reviewed-by: John Budorick Reviewed-by: Ben Wells Reviewed-by: Nico Weber Reviewed-by: Roger Tawa Cr-Commit-Position: refs/heads/master@{#660057} --- .gn | 1 - DEPS | 3 --- .../lib/common/chrome_test_server_spawner.py | 9 +++++---- chrome/credential_provider/test/BUILD.gn | 1 - chrome/test/BUILD.gn | 4 ---- content/test/BUILD.gn | 1 - extensions/BUILD.gn | 1 - headless/BUILD.gn | 1 - net/BUILD.gn | 3 --- .../url_loader/README_chrome_developer.txt | 6 ++---- services/network/BUILD.gn | 1 - third_party/.gitignore | 1 - third_party/pyftpdlib/BUILD.gn | 12 ------------ third_party/pyftpdlib/README.chromium | 16 ---------------- 14 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 third_party/pyftpdlib/BUILD.gn delete mode 100644 third_party/pyftpdlib/README.chromium diff --git a/.gn b/.gn index 3464667611888a..a98d422fd82de4 100644 --- a/.gn +++ b/.gn @@ -525,7 +525,6 @@ check_targets = [ "//third_party/protobuf/*", "//third_party/pycoverage/*", "//third_party/pyelftools/*", - "//third_party/pyftpdlib/*", "//third_party/pyjson5/*", "//third_party/pylint/*", "//third_party/pymock/*", diff --git a/DEPS b/DEPS index 3b8a1dd9b41cc1..8eb910e1f3ef95 100644 --- a/DEPS +++ b/DEPS @@ -1212,9 +1212,6 @@ deps = { 'condition': 'checkout_linux', }, - 'src/third_party/pyftpdlib/src': - Var('chromium_git') + '/external/pyftpdlib.git' + '@' + '2be6d65e31c7ee6320d059f581f05ae8d89d7e45', - 'src/third_party/quic_trace/src': Var('chromium_git') + '/external/github.com/google/quic-trace.git' + '@' + '8415c22f0ca2485bd8a16eff64075f4361f3878e', diff --git a/build/util/lib/common/chrome_test_server_spawner.py b/build/util/lib/common/chrome_test_server_spawner.py index b9844aa39159ce..19b2a1b0fd4faf 100644 --- a/build/util/lib/common/chrome_test_server_spawner.py +++ b/build/util/lib/common/chrome_test_server_spawner.py @@ -41,10 +41,9 @@ # Path that are needed to import necessary modules when launching a testserver. -os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + (':%s:%s:%s:%s:%s' +os.environ['PYTHONPATH'] = os.environ.get('PYTHONPATH', '') + (':%s:%s:%s:%s' % (os.path.join(_DIR_SOURCE_ROOT, 'third_party'), os.path.join(_DIR_SOURCE_ROOT, 'third_party', 'tlslite'), - os.path.join(_DIR_SOURCE_ROOT, 'third_party', 'pyftpdlib', 'src'), os.path.join(_DIR_SOURCE_ROOT, 'net', 'tools', 'testserver'), os.path.join(_DIR_SOURCE_ROOT, 'components', 'sync', 'tools', 'testserver'))) @@ -232,11 +231,13 @@ def run(self): self._GenerateCommandLineArguments() command = _DIR_SOURCE_ROOT if self.arguments['server-type'] == 'sync': - command = [os.path.join(command, 'components', 'sync', 'tools', + command = [sys.executable, + os.path.join(command, 'components', 'sync', 'tools', 'testserver', 'sync_testserver.py')] + self.command_line else: - command = [os.path.join(command, 'net', 'tools', 'testserver', + command = [sys.executable, + os.path.join(command, 'net', 'tools', 'testserver', 'testserver.py')] + self.command_line _logger.info('Running: %s', command) diff --git a/chrome/credential_provider/test/BUILD.gn b/chrome/credential_provider/test/BUILD.gn index 7aae989209bf69..5455dccc44e070 100644 --- a/chrome/credential_provider/test/BUILD.gn +++ b/chrome/credential_provider/test/BUILD.gn @@ -47,7 +47,6 @@ test("gcp_unittests") { data = [ "//net/tools/testserver/", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", ] diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 23404ab64cc14f..bcd64627d066d0 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -1240,7 +1240,6 @@ test("browser_tests") { "//third_party/chaijs/chai.js", "//third_party/mocha/mocha.js", "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/simplejson/", "//third_party/tlslite/", @@ -3119,7 +3118,6 @@ test("unit_tests") { "//net/tools/testserver/", "//third_party/accessibility-audit/axs_testing.js", "//third_party/chaijs/chai.js", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", "//third_party/zlib/google/test/data/", @@ -5096,7 +5094,6 @@ if (!is_android) { "//third_party/chaijs/chai.js", "//third_party/mocha/mocha.js", "//third_party/polymer/v1_0/components-chromium/iron-test-helpers/mock-interactions.js", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", "//third_party/zlib/google/test/data/", @@ -5649,7 +5646,6 @@ if (!is_android && !is_fuchsia) { data = [ "//chrome/test/data/sync/", "//net/tools/testserver/", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", "//testing/xvfb.py", diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 407c3427d38424..98455d6b56ae5f 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -1137,7 +1137,6 @@ test("content_browsertests") { "//ppapi/tests/test_case.html", "//ppapi/tests/test_page.css", "//ppapi/tests/test_url_loader_data/", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", ] diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 2e1d8f7d3cb065..e904d6147ab5ff 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -244,7 +244,6 @@ test("extensions_browsertests") { data = [ "//extensions/test/data/", "//net/tools/testserver/", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", "$root_out_dir/extensions_shell_and_test.pak", diff --git a/headless/BUILD.gn b/headless/BUILD.gn index e8709078a43ce1..d127356c2c0ef3 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn @@ -731,7 +731,6 @@ test("headless_browsertests") { "$root_out_dir/headless_lib.pak", "//net/tools/testserver/", "//third_party/blink/web_tests/http/tests/inspector-protocol/", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/", "//third_party/tlslite/", "test/data/", diff --git a/net/BUILD.gn b/net/BUILD.gn index 82aa071398ad7f..699a61808bdb0a 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -5633,18 +5633,15 @@ test("net_unittests") { if (is_linux || is_mac || is_win || is_fuchsia) { deps += [ - "//third_party/pyftpdlib/", "//third_party/pywebsocket/", "//third_party/tlslite/", ] data_deps += [ - "//third_party/pyftpdlib/", "//third_party/pywebsocket/", "//third_party/tlslite/", ] data += [ "tools/testserver/", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", ] diff --git a/ppapi/examples/url_loader/README_chrome_developer.txt b/ppapi/examples/url_loader/README_chrome_developer.txt index c9a67212c2d7eb..6bab676c00ab6b 100644 --- a/ppapi/examples/url_loader/README_chrome_developer.txt +++ b/ppapi/examples/url_loader/README_chrome_developer.txt @@ -5,12 +5,10 @@ Build the example, i.e. "make ppapi_example_url_loader" on Linux. In the "src" directory, start the test server: On Linux: - export PYTHONPATH=third_party/pyftpdlib:third_party/tlslite:third_party - python net/tools/testserver/testserver.py --port=1337 --data-dir=ppapi/examples/url_loader + vpython net/tools/testserver/testserver.py --port=1337 --data-dir=ppapi/examples/url_loader On Windows: - set PYTHONPATH=third_party\pyftpdlib;third_party\tlslite:third_party - python net/tools/testserver/testserver.py --port=1337 --data-dir=ppapi/examples/url_loader + vpython net/tools/testserver/testserver.py --port=1337 --data-dir=ppapi/examples/url_loader Then load the page: diff --git a/services/network/BUILD.gn b/services/network/BUILD.gn index d0600c5fd49e83..eb1261060bbea2 100644 --- a/services/network/BUILD.gn +++ b/services/network/BUILD.gn @@ -352,7 +352,6 @@ source_set("tests") { data = [ "//net/tools/testserver/", "//services/test/data", - "//third_party/pyftpdlib/", "//third_party/pywebsocket/src/mod_pywebsocket/", "//third_party/tlslite/", ] diff --git a/third_party/.gitignore b/third_party/.gitignore index 2f1abc9c667263..7ff6e4e97724a7 100644 --- a/third_party/.gitignore +++ b/third_party/.gitignore @@ -181,7 +181,6 @@ /pthreads-win32 /py_trace_event/src /pyelftools -/pyftpdlib/src /pylib /pymox/src /python_24 diff --git a/third_party/pyftpdlib/BUILD.gn b/third_party/pyftpdlib/BUILD.gn deleted file mode 100644 index 7301572ea3470a..00000000000000 --- a/third_party/pyftpdlib/BUILD.gn +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2015 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# pyftpdlib is a Python program. Depend on this to get the data deps necessary -# to run it in the test environment. -group("pyftpdlib") { - # For now, depend on the entire directory. - data = [ - "//third_party/pyftpdlib/", - ] -} diff --git a/third_party/pyftpdlib/README.chromium b/third_party/pyftpdlib/README.chromium deleted file mode 100644 index 2520861b9f2fc1..00000000000000 --- a/third_party/pyftpdlib/README.chromium +++ /dev/null @@ -1,16 +0,0 @@ -Name: Python FTP server library -Short Name: pyftpdlib -URL: https://github.com/giampaolo/pyftpdlib -Version: 0.7.0-updates -Revision: 2be6d65e31c7ee6320d059f581f05ae8d89d7e45 -License: MIT -License File: NOT_SHIPPED -Security Critical: no - -Description: -Python FTP server library provides an high-level portable interface to easily -write asynchronous FTP servers with Python. Based on asyncore framework -pyftpdlib is currently the most complete RFC-959 FTP server implementation -available for Python programming language. - -Learn more by visiting: http://pythonhosted.org/pyftpdlib/faqs.html