Commit 0ce4eb6

author

derwentx

committed

merge changes from #3

1 parent 7aba142 commit 0ce4eb6Copy full SHA for 0ce4eb6

File tree

+25

-5

lines changed

+25

-5

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`language: python`
`2`	`2`	`sudo: required`
	`3`	`+env:`
	`4`	`+ - CODECOV_TOKEN: "da32b183-0d8b-4dc2-9bf9-e1743a39b2c8"`
`3`	`5`	`services:`
`4`	`6`	`- docker`
`5`	`7`	`python:`
`@@ -14,4 +16,6 @@ install:`
`14`	`16`	`- docker exec -it wpapipython_woocommerce_1 bash -c 'until [ -f .done ]; do sleep 1; done; echo "complete"'`
`15`	`17`	`# command to run tests`
`16`	`18`	`script:`
`17`		`- - pytest`
	`19`	`+ - py.test --cov=wordpress tests.py`
	`20`	`+after_success:`
	`21`	`+ - codecov`

Lines changed: 3 additions & 1 deletion

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`from json import dumps as jsonencode`
`12`	`12`
`13`	`13`	`from six import binary_type, text_type`
`14`		`-from wordpress.auth import BasicAuth, OAuth, OAuth_3Leg`
	`14`	`+from wordpress.auth import BasicAuth, OAuth, OAuth_3Leg, NoAuth`
`15`	`15`	`from wordpress.helpers import StrUtils, UrlUtils`
`16`	`16`	`from wordpress.transport import API_Requests_Wrapper`
`17`	`17`
`@@ -35,6 +35,8 @@ def __init__(self, url, consumer_key, consumer_secret, **kwargs):`
`35`	`35`	`auth_class = BasicAuth`
`36`	`36`	`elif kwargs.get('oauth1a_3leg'):`
`37`	`37`	`auth_class = OAuth_3Leg`
	`38`	`+ elif kwargs.get('no_auth'):`
	`39`	`+ auth_class = NoAuth`
`38`	`40`
`39`	`41`	`if kwargs.get('version', '').startswith('wc') and kwargs.get('oauth1a_3leg'):`
`40`	`42`	`self.logger.warn("WooCommerce JSON Api does not seem to support 3leg")`
`@@ -170,10 +172,10 @@ def request_post_mortem(self, response=None):`
`170`	`172`	`text_type(response.status_code),`
`171`	`173`	`UrlUtils.beautify_response(response),`
`172`	`174`	`text_type(response_headers),`
`173`		`- repr(request_body)[:1000]`
	`175`	`+ StrUtils.to_binary(request_body)[:1000]`
`174`	`176`	`)`
`175`	`177`	`if reason:`
`176`		`- msg += "\nBecause of %s" % reason`
	`178`	`+ msg += "\nBecause of %s" % StrUtils.to_binary(reason)`
`177`	`179`	`if remedy:`
`178`	`180`	`msg += "\n%s" % remedy`
`179`	`181`	`raise UserWarning(msg)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,13 @@ def get_auth(self):`
`94`	`94`	`if not self.query_string_auth:`
`95`	`95`	`return HTTPBasicAuth(self.consumer_key, self.consumer_secret)`
`96`	`96`
	`97`	`+class NoAuth(Auth):`
	`98`	`+ """`
	`99`	`+ Just a dummy Auth object to allow header based`
	`100`	`+ authorization per request`
	`101`	`+ """`
	`102`	`+ def get_auth_url(self, endpoint_url, method, **kwargs):`
	`103`	`+ return endpoint_url`
`97`	`104`
`98`	`105`	`class OAuth(Auth):`
`99`	`106`	`""" Signs string with oauth consumer_key and consumer_secret """`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ def __init__(self, url, **kwargs):`
`33`	`33`	`self.timeout = kwargs.get("timeout", 5)`
`34`	`34`	`self.verify_ssl = kwargs.get("verify_ssl", True)`
`35`	`35`	`self.session = Session()`
	`36`	`+ self.headers = kwargs.get("headers", {})`
`36`	`37`
`37`	`38`	`@property`
`38`	`39`	`def is_ssl(self):`
`@@ -86,6 +87,10 @@ def request(self, method, url, auth=None, params=None, data=None, **kwargs):`
`86`	`87`	`}`
`87`	`88`	`if data is not None:`
`88`	`89`	`headers["content-type"] = "application/json;charset=utf-8"`
	`90`	`+ headers = SeqUtils.combine_ordered_dicts(`
	`91`	`+ headers,`
	`92`	`+ self.headers`
	`93`	`+ )`
`89`	`94`	`headers = SeqUtils.combine_ordered_dicts(`
`90`	`95`	`headers,`
`91`	`96`	`kwargs.get('headers', {})`

Comments

(0)