Merge remote-tracking branch 'woocommerce/master'

derwentx · derwentx · commit 930ecbba4332 · 2017-08-14T17:11:41.000+10:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ dist/
 *.egg-info/
 run.py
 run3.py
+*.orig
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
     version=VERSION,
     description="A Python wrapper for the Wordpress and WooCommerce REST APIs with oAuth1a 3leg support",
     long_description=README,
-    author="Claudio Sanches @ WooThemes",
+    author="Claudio Sanches @ Automattic , forked by Derwent @ Laserphile",
     url="https://github.com/woocommerce/wc-api-python",
     license="MIT License",
     packages=[
diff --git a/wordpress/__init__.py b/wordpress/__init__.py
@@ -3,15 +3,15 @@
 """
 wordpress
 ~~~~~~~~~
-A Python wrapper for Wordpress REST API.
+A Python wrapper for Wordpress and WooCommerce REST APIs.
 
 :copyright: (c) 2015 by WooThemes.
 :license: MIT, see LICENSE for details.
 """
 
 __title__ = "wordpress"
 __version__ = "1.2.2"
-__author__ = "Claudio Sanches @ WooThemes"
+__author__ = "Claudio Sanches @ WooThemes, forked by Derwent"
 __license__ = "MIT"
 
 __default_api_version__ = "wp/v2"
diff --git a/wordpress/api.py b/wordpress/api.py
@@ -90,7 +90,8 @@ def __request(self, method, endpoint, data):
         )
 
         assert \
-            response.status_code in [200, 201], "API call to %s returned \nCODE: %s\n%s \nHEADERS: %s" % (
+            response.status_code in [200, 201], \
+            "API call to %s returned \nCODE: %s\n%s \nHEADERS: %s" % (
                 response.request.url,
                 str(response.status_code),
                 UrlUtils.beautify_response(response),

-Original file line number
+Diff line change
 *.egg-info/
 run.py
 run3.py
 +*.orig
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ def __request(self, method, endpoint, data):`
`90`	`90`	`)`
`91`	`91`
`92`	`92`	`assert \`
`93`		`- response.status_code in [200, 201], "API call to %s returned \nCODE: %s\n%s \nHEADERS: %s" % (`
	`93`	`+ response.status_code in [200, 201], \`
	`94`	`+ "API call to %s returned \nCODE: %s\n%s \nHEADERS: %s" % (`
`94`	`95`	`response.request.url,`
`95`	`96`	`str(response.status_code),`
`96`	`97`	`UrlUtils.beautify_response(response),`