删除冗余代码

FworkSpider/feapder/network/request.py

@@ -383,6 +383,7 @@ class Request(object):
         elif use_session:
             response = self._session.request(method, self.url, **self.requests_kwargs)
             response = Response(response)
+
         elif self.splash:
             headers = self.requests_kwargs.get('headers')
             if not headers:
@@ -407,38 +408,6 @@ class Request(object):
             resp = requests.get(splash_url, params=params, json=data)
             response = Response(resp)
 
-            # if self.iframes:
-            # # response = Response(resp)
-            #     res = resp.json()
-            #     response = Response.from_dict(
-            #         {
-            #             "url": self.url,
-            #             "cookies": resp.cookies,
-            #             "_content": res.get("html"),
-            #             "status_code": 200,
-            #             "resp": resp,
-            #             "elapsed": 666,
-            #             "headers":resp.headers
-            #         }
-            #     )
-            # else:
-            #     res = resp.json()
-            #     html = res.get("html")
-            #     for item in res.get("childFrames"):
-            #         html += item.get("html")
-            #
-            #     response = Response.from_dict(
-            #         {
-            #             "url": self.url,
-            #             "cookies": resp.cookies,
-            #             "_content": html,
-            #             "status_code": 200,
-            #             "resp": res,
-            #             "elapsed": 666,
-            #             "headers": resp.headers
-            #
-            #         }
-            #     )
         else:
             response = requests.request(method, self.url, **self.requests_kwargs)
             response = Response(response)
@@ -496,7 +465,7 @@ class Request(object):
     @property
     def _cache_db(self):
         if not self.__class__.cache_db:
-            self.__class__.cache_db = RedisDB()  # .from_url(setting.pika_spider_1_uri)
+            self.__class__.cache_db = RedisDB()
 
         return self.__class__.cache_db