Skip to content

Commit

Permalink
fix crawl response key errors
Browse files Browse the repository at this point in the history
_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
  • Loading branch information
simonsdave committed Mar 4, 2017
1 parent 633924a commit b6c8d3d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 15 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Expand Up @@ -11,7 +11,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- Nothing
- 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

### Removed

Expand Down
20 changes: 10 additions & 10 deletions cloudfeaster/spider.py
Expand Up @@ -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

#
Expand All @@ -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'] = {
Expand All @@ -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):
Expand Down Expand Up @@ -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)

#
Expand All @@ -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)
8 changes: 4 additions & 4 deletions cloudfeaster/tests/spider_tests.py
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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):
Expand All @@ -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)


Expand Down

0 comments on commit b6c8d3d

Please sign in to comment.