Revert D57404528: Multisect successfully blamed "D57404528: Reland "M…

…erge thrift py3 and thrift python client request channel definitions into a single file" ... again" for one test failure

Summary:
This diff reverts D57404528
Depends on D57430549
D57404528: Reland "Merge thrift py3 and thrift python client request channel definitions into a single file" ... again by Filip-F causes the following test failure:

Tests affected:
- [cogwheel:cogwheel_conductor#main](https://www.internalfb.com/intern/test/844425041013411/)

Here's the Multisect link:
https://www.internalfb.com/multisect/5102759
Here are the tasks that are relevant to this breakage:

The backout may land if someone accepts it.

If this diff has been generated in error, you can Commandeer and Abandon it.

Reviewed By: fejese

Differential Revision: D57430590

fbshipit-source-id: a673e2fd29b21d0043493713c151b7198e7a88ad

third-party/thrift/src/thrift/lib/py3/client.h

@@ -33,7 +33,10 @@
 
 namespace thrift {
 namespace py3 {
-using RequestChannel_ptr = apache::thrift::RequestChannel::Ptr;
+typedef std::unique_ptr<
+    apache::thrift::RequestChannel,
+    folly::DelayedDestruction::Destructor>
+    RequestChannel_ptr;
 
 typedef std::unique_ptr<
     apache::thrift::HeaderClientChannel,

third-party/thrift/src/thrift/lib/py3/client.pxd

@@ -35,7 +35,6 @@ from libcpp cimport bool
 from asyncio import InvalidStateError as asyncio_InvalidStateError
 from thrift.python.common cimport cThriftMetadata
 from thrift.python.protocol cimport Protocol as cProtocol
-from thrift.python.client.request_channel cimport cRequestChannel, cRequestChannel_ptr
 from folly.executor cimport AsyncioExecutor
 
 cdef extern from "thrift/lib/cpp/transport/THeader.h":
@@ -52,6 +51,10 @@ cdef extern from "thrift/lib/cpp/transport/THeader.h":
         THRIFT_UNFRAMED_COMPACT_DEPRECATED
 
 cdef extern from "thrift/lib/py3/client.h" namespace "::thrift::py3":
+    # The custome deleter is hard, so instead make cython treat it as class
+    cdef cppclass cRequestChannel_ptr "::thrift::py3::RequestChannel_ptr":
+        pass
+
     cdef cFollyFuture[cRequestChannel_ptr] createThriftChannelTCP(
         string&& host,
         const uint16_t port,