55"""
66
77__title__ = "woocommerce-api"
8- __version__ = "2.1.1 "
8+ __version__ = "2.1.2 "
99__author__ = "Claudio Sanches @ Automattic"
1010__license__ = "MIT"
1111
1212from requests import request
1313from json import dumps as jsonencode
1414from time import time
1515from woocommerce .oauth import OAuth
16+ from requests .auth import HTTPBasicAuth
1617
1718try :
1819from urllib .parse import urlencode
@@ -44,12 +45,12 @@ def __get_url(self, endpoint):
4445api = "wc-api"
4546
4647if url .endswith ("/" )is False :
47- url = "%s/" % url
48+ url = f" { url } /"
4849
4950if self .wp_api :
5051api = "wp-json"
5152
52- return "%s%s/%s/%s" % ( url , api , self .version , endpoint )
53+ return f" { url } { api } / { self .version } / { endpoint } "
5354
5455def __get_oauth_url (self ,url ,method ,** kwargs ):
5556""" Generate oAuth1.0a URL """
@@ -71,20 +72,20 @@ def __request(self, method, endpoint, data, params=None, **kwargs):
7172url = self .__get_url (endpoint )
7273auth = None
7374headers = {
74- "user-agent" :" WooCommerce APIClient-Python/%s" % __version__ ,
75+ "user-agent" :f' WooCommerce API{ __version__ } '
7576"accept" :"application/json"
7677 }
7778
7879if self .is_ssl is True and self .query_string_auth is False :
79- auth = (self .consumer_key ,self .consumer_secret )
80+ auth = HTTPBasicAuth (self .consumer_key ,self .consumer_secret )
8081elif self .is_ssl is True and self .query_string_auth is True :
8182params .update ({
8283"consumer_key" :self .consumer_key ,
8384"consumer_secret" :self .consumer_secret
8485 })
8586else :
8687encoded_params = urlencode (params )
87- url = "%s?%s" % ( url , encoded_params )
88+ url = f" { url } ? { encoded_params } "
8889url = self .__get_oauth_url (url ,method ,** kwargs )
8990
9091if data is not None :
@@ -122,4 +123,3 @@ def delete(self, endpoint, **kwargs):
122123def options (self ,endpoint ,** kwargs ):
123124""" OPTIONS requests """
124125return self .__request ("OPTIONS" ,endpoint ,None ,** kwargs )
125-