🐛Fix joke_type

Author: benjhar

README.md

@@ -115,19 +115,20 @@ If left blank it will default to `json`.
 
 ---
 
-#### type
+#### joke_type
 
 The type of joke returned.
 Options are:
 `single`,
-`twopart`
+`twopart`,
+`Any`
 
 If left blank it will default to `Any`
 
 ##### Example
 
 ```python
-  joke = j.get_joke(type="twopart")  # Will return a twopart joke; both a setup and a delivery.
+  joke = j.get_joke(joke_type="twopart")  # Will return a twopart joke; both a setup and a delivery.
 ```
 
 ---

jokeapi/main.py

@@ -33,7 +33,7 @@ def build_request(
         category=[],
         blacklist=[],
         response_format="json",
-        type="Any",
+        joke_type="Any",
         search_string="",
         id_range=[],
         amount=1,
@@ -82,15 +82,15 @@ def build_request(
             raise ResponseTypeError(
                 "Response format must be either json, xml, txt or yaml."
             )
-        if type:
-            if type not in ["single", "twopart"]:
+        if joke_type:
+            if joke_type not in ["single", "twopart", "Any"]:
                 raise JokeTypeError(
                     '''Invalid joke type.
                     Available options are "single" or "twopart".'''
                 )
                 return
         else:
-            type = "Any"
+            joke_type = "Any"
 
         if search_string:
             if not isinstance(search_string, str):
@@ -119,7 +119,7 @@ def build_request(
         if blacklistFlags:
             r += f"&blacklistFlags={blacklistFlags}"
 
-        r += f"&type={type}"
+        r += f"&type={joke_type}"
 
         if search_string:
             r += f"&contains={search_string}"
@@ -192,7 +192,7 @@ def get_joke(
         category=[],
         blacklist=[],
         response_format="json",
-        type="Any",
+        joke_type="Any",
         search_string="",
         id_range=[],
         amount=1,
@@ -206,7 +206,7 @@ def get_joke(
             category,
             blacklist,
             response_format,
-            type,
+            joke_type,
             search_string,
             id_range,
             amount,

test_main.py

@@ -76,12 +76,12 @@
 
 """Testing for errors in type"""
 try:
-    j.get_joke(type="single", auth_token=token)
+    j.get_joke(joke_type="single", auth_token=token)
 except Exception as e:
     errors.append({'Error in':  'type single', 'Error': e})
 
 try:
-    j.get_joke(type="twopart", auth_token=token)
+    j.get_joke(joke_type="twopart", auth_token=token)
 except Exception as e:
     errors.append({'Error in':  'type double', 'Error': e})