- Correct Exclusion logic between Country & Category checks

- Add NewsApiException type
- Update version to 0.2.1

Author: Matt Lisivick

newsapi/newsapi_client.py

@@ -1,6 +1,7 @@
 import requests
 from newsapi.newsapi_auth import NewsApiAuth
 from newsapi import const
+from newsapi.newsapi_exception import NewsAPIException
 
 
 class NewsApiClient(object):
@@ -38,7 +39,7 @@ def get_top_headlines(self, q=None, sources=None, language=None, country=None, c
 								
 		(int) page - Use this to page through the results if the total results found is greater than the page size.									
         """
-        
+
         # Define Payload
         payload = {}
 
@@ -49,36 +50,38 @@ def get_top_headlines(self, q=None, sources=None, language=None, country=None, c
             else:
                 raise TypeError('keyword/phrase q param should be a str')
 
-        # Sources 
-        if (country is not None) or (category is not None):
-            raise ValueError('cannot mix country/category param with sources param.')
-        else:
+                # Sources
+        if sources is not None:
             if type(sources) == str:
-                payload['sources'] = sources 
+                payload['sources'] = sources
             else:
                 raise TypeError('sources param should be a str')
 
+        # Sources 
+        if (country is not None) and (category is not None):
+            raise ValueError('cannot mix country/category param with sources param.')
+
         # Language 
         if language is not None:
             if type(language) == str:
                 if language in const.languages:
                     payload['language'] = language
                 else:
                     raise ValueError('invalid language')
-            else: 
+            else:
                 raise TypeError('language param should be a string')
 
         # Country
         if country is not None:
             if type(country) == str:
-                if country in const.countries: 
+                if country in const.countries:
                     payload['country'] = country
                 else:
                     raise ValueError('invalid country')
             else:
-                raise TypeError('country param should be a string') 
-        
-        # Category
+                raise TypeError('country param should be a string')
+
+                # Category
         if category is not None:
             if type(category) == str:
                 if category in const.categories:
@@ -87,7 +90,7 @@ def get_top_headlines(self, q=None, sources=None, language=None, country=None, c
                     raise ValueError('invalid category')
             else:
                 raise TypeError('category param should be a string')
-        
+
         # Page Size
         if page_size is not None:
             if type(page_size) == int:
@@ -149,7 +152,7 @@ def get_everything(self, q=None, sources=None, domains=None, from_param=None, to
 
 		(int) page - Use this to page through the results if the total results found is greater than the page size.									
         """
-					   
+
         # Define Payload
         payload = {}
 
@@ -159,16 +162,14 @@ def get_everything(self, q=None, sources=None, domains=None, from_param=None, to
                 payload['q'] = q
             else:
                 raise TypeError('keyword/phrase q param should be a str')
- 
-        # Sources 
-        if (country is not None) or (category is not None):
-            raise ValueError('cannot mix country or category param with sources param.')
-        else:
+
+        # Sources
+        if sources is not None:
             if type(sources) == str:
                 payload['sources'] = sources
             else:
                 raise TypeError('sources param should be a str')
-       
+
         # Domains To Search
         if domains is not None:
             if type(domains) == str:
@@ -204,7 +205,6 @@ def get_everything(self, q=None, sources=None, domains=None, from_param=None, to
             else:
                 raise TypeError('to param should be a string')
 
-
         # Language
         if language is not None:
             if type(language) == str:
@@ -214,7 +214,6 @@ def get_everything(self, q=None, sources=None, domains=None, from_param=None, to
                     payload['language'] = language
             else:
                 raise TypeError('language param should be a string')
-            
 
         # Sort Method
         if sort_by is not None:
@@ -225,7 +224,7 @@ def get_everything(self, q=None, sources=None, domains=None, from_param=None, to
                     raise ValueError('invalid sort')
             else:
                 raise TypeError('sort_by param should be a string')
-          
+
         # Page Size
         if page_size is not None:
             if type(page_size) == int:
@@ -246,11 +245,10 @@ def get_everything(self, q=None, sources=None, domains=None, from_param=None, to
             else:
                 raise TypeError('page param should be an int')
 
-
         # Send Request
         r = requests.get(const.EVERYTHING_URL, auth=self.auth, timeout=30, params=payload)
 
-        #Check Status of Request
+        # Check Status of Request
         if r.status_code != requests.codes.ok:
             raise NewsAPIException(r.json())
 
@@ -275,8 +273,8 @@ def get_sources(self, category=None, language=None, country=None):
 				(str) category - The category you want to get headlines for! Valid values are:
 						'business','entertainment','general','health','science','sports','technology'
 																	
-        """			   
-					   
+        """
+
         # Define Payload
         payload = {}
 
@@ -287,20 +285,20 @@ def get_sources(self, category=None, language=None, country=None):
                     payload['language'] = language
                 else:
                     raise ValueError('invalid language')
-            else: 
+            else:
                 raise TypeError('language param should be a string')
 
         # Country
         if country is not None:
             if type(country) == str:
-                if country in const.countries: 
+                if country in const.countries:
                     payload['country'] = country
                 else:
                     raise ValueError('invalid country')
             else:
-                raise TypeError('country param should be a string') 
+                raise TypeError('country param should be a string')
 
-        # Category
+                # Category
         if category is not None:
             if type(category) == str:
                 if category in const.categories:
@@ -318,4 +316,3 @@ def get_sources(self, category=None, language=None, country=None):
             raise NewsAPIException(r.json())
 
         return r.json()
-

newsapi/newsapi_exception.py

@@ -0,0 +1,19 @@
+class NewsAPIException(Exception):
+
+    def __init__(self, exception):
+        self.exception = exception
+
+    def get_exception(self):
+        return self.exception
+
+    def get_status(self):
+        if self.exception["status"]:
+            return self.exception["status"]
+
+    def get_code(self):
+        if self.exception["code"]:
+            return self.exception["code"]
+
+    def get_message(self):
+        if self.exception["message"]:
+            return self.exception["message"]

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name='newsapi-python',
-    version='0.0.2',
+    version='0.2.1',
     author='Matt Lisivick',
     author_email='lisivickmatt@gmail.com',
     license='MIT',