From c38f57e959f10f40129086c6b5ed969643d16abf Mon Sep 17 00:00:00 2001 From: simonsdave Date: Fri, 3 Mar 2017 19:40:44 -0500 Subject: [PATCH] fix crawl response key errors _status & _status_code in crawl response were missing the leading underscore for the following responses SC_CTR_RAISED_EXCEPTION SC_INVALID_CRAWL_RETURN_TYPE SC_CRAWL_RAISED_EXCEPTION SC_SPIDER_NOT_FOUND --- cloudfeaster/spider.py | 20 ++++++++++---------- cloudfeaster/tests/spider_tests.py | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cloudfeaster/spider.py b/cloudfeaster/spider.py index 8072899..3f80033 100644 --- a/cloudfeaster/spider.py +++ b/cloudfeaster/spider.py @@ -410,8 +410,8 @@ def crawl(self, *args, **kwargs): except Exception as ex: status = "Spider's ctr raised exception = %s" % ex cr = CrawlResponse( - status_code=CrawlResponse.SC_CTR_RAISED_EXCEPTION, - status=status) + _status_code=CrawlResponse.SC_CTR_RAISED_EXCEPTION, + _status=status) return cr # @@ -430,8 +430,8 @@ def crawl(self, *args, **kwargs): ) status = status_fmt % (type(crawl_response), CrawlResponse) crawl_response = CrawlResponse( - status_code=CrawlResponse.SC_INVALID_CRAWL_RETURN_TYPE, - status=status) + _status_code=CrawlResponse.SC_INVALID_CRAWL_RETURN_TYPE, + _status=status) return crawl_response crawl_response['_spider'] = { @@ -443,8 +443,8 @@ def crawl(self, *args, **kwargs): except Exception as ex: status = "Spider's crawl raised exception - %s" % ex crawl_response = CrawlResponse( - status_code=CrawlResponse.SC_CRAWL_RAISED_EXCEPTION, - status=status) + _status_code=CrawlResponse.SC_CRAWL_RAISED_EXCEPTION, + _status=status) return crawl_response def _get_spider_class(self): @@ -478,8 +478,8 @@ def _get_spider_class(self): except Exception: status = "Could not find spider '%s'" % self.full_spider_class_name crawl_response = CrawlResponse( - status_code=CrawlResponse.SC_SPIDER_NOT_FOUND, - status=status) + _status_code=CrawlResponse.SC_SPIDER_NOT_FOUND, + _status=status) return (None, crawl_response) # @@ -497,6 +497,6 @@ def _get_spider_class(self): except Exception: status = "Could not find spider '%s'" % self.full_spider_class_name crawl_response = CrawlResponse( - status_code=CrawlResponse.SC_SPIDER_NOT_FOUND, - status=status) + _status_code=CrawlResponse.SC_SPIDER_NOT_FOUND, + _status=status) return (None, crawl_response) diff --git a/cloudfeaster/tests/spider_tests.py b/cloudfeaster/tests/spider_tests.py index 2f38e3d..f8e21e9 100644 --- a/cloudfeaster/tests/spider_tests.py +++ b/cloudfeaster/tests/spider_tests.py @@ -150,7 +150,7 @@ def test_spider_not_found_from_name(self): rv = spider_crawler.crawl() self.assertTrue(isinstance(rv, spider.CrawlResponse)) self.assertEqual( - rv.status_code, + rv._status_code, spider.CrawlResponse.SC_SPIDER_NOT_FOUND) def test_walk_with_spider_ctr_that_raises_exception(self): @@ -159,7 +159,7 @@ def test_walk_with_spider_ctr_that_raises_exception(self): rv = spider_crawler.crawl() self.assertTrue(isinstance(rv, spider.CrawlResponse)) self.assertEqual( - rv.status_code, + rv._status_code, spider.CrawlResponse.SC_CTR_RAISED_EXCEPTION) def test_walk_with_crawl_method_that_raises_exception(self): @@ -168,7 +168,7 @@ def test_walk_with_crawl_method_that_raises_exception(self): rv = spider_crawler.crawl() self.assertTrue(isinstance(rv, spider.CrawlResponse)) self.assertEqual( - rv.status_code, + rv._status_code, spider.CrawlResponse.SC_CRAWL_RAISED_EXCEPTION) def test_walk_with_crawl_method_with_invalid_return_type(self): @@ -177,7 +177,7 @@ def test_walk_with_crawl_method_with_invalid_return_type(self): rv = spider_crawler.crawl() self.assertTrue(isinstance(rv, spider.CrawlResponse)) self.assertEqual( - rv.status_code, + rv._status_code, spider.CrawlResponse.SC_INVALID_CRAWL_RETURN_TYPE)