Remove //third_party/pyftpdlib.

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 <eroman@chromium.org>
Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660057}

.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/*",

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',
 

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)
 

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/",
   ]

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",

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/",
     ]

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",

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/",

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/",
     ]

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:
 

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/",
     ]

third_party/.gitignore

@@ -181,7 +181,6 @@
 /pthreads-win32
 /py_trace_event/src
 /pyelftools
-/pyftpdlib/src
 /pylib
 /pymox/src
 /python_24