Cleanup code and update acceptsale version

scripts/bumpversion.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # coding: utf-8
-from __future__ import unicode_literals, print_function
 import sys
 import os
 import re

shiba/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.1.12"
+__version__ = "1.2.0"
 VERSION = __version__

shiba/accountingmanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from datetime import date
 
 from .shibaconnection import ShibaConnection

shiba/compat.py

@@ -54,7 +54,7 @@ def reraise(tp, value, tb=None):
     def is_bytes(x):
         return isinstance(x, (bytes, memoryview, bytearray))
 
-    from collections import Callable
+    from collections.abc import Callable
 
     def callable(obj):
         return isinstance(obj, Callable)

shiba/inventorymanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from .shibaconnection import ShibaConnection
 from .shibaexceptions import ShibaCallingError
 from .shibatools import (

shiba/marketplacemanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from .shibaconnection import ShibaConnection
 from .shibatools import inf_constructor, url_constructor, retrieve_obj_from_url
 from .compat import basestring

shiba/salesmanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from datetime import date
 
 from .shibaconnection import ShibaConnection
@@ -26,10 +24,11 @@ def get_new_sales(self):
         obj = retrieve_obj_from_url(url)
         return obj
 
-    def accept_sale(self, itemid):
+    def accept_sale(self, itemid, shippingfromcountry):
         """Accept the "itemid" sale.
 
         :param itemid: string for item ID
+        :param shippingfromcountry: string ISO code for country
         """
         inf = inf_constructor(self.connection, "acceptsale", **locals())
         url = url_constructor(self.connection, inf)

shiba/shibaconnection.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 
 class ShibaConnection(object):
     """The main Shiba class, standing as an initialization and mandatory for each submodules instancing.
@@ -76,7 +74,7 @@ def __init__(self, login, pwd, sandbox=False):
             },
             "acceptsale": {
                 "cat": "sales_ws",
-                "version": "2010-09-20",
+                "version": "2021-04-08",
                 "login": self.login,
                 "pwd": self.pwd,
             },

shiba/shibaexceptions.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 """ Those exception classes will usually be raised after an error returned from the WebServices."""
-from __future__ import unicode_literals
-
 
 class ShibaException(Exception):
     """Main exception class, as you can catch the whole of Shiba exceptions from it"""

shiba/shibaresponseobject.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 
 class ShibaResponseObject(object):
     """This class gathers all content from the returned XML. Separating the namespace for further usage and the actual

shiba/shibatools.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 """ Tools used by Shiba data retrieving classes"""
-from __future__ import unicode_literals
-
 import re
 from collections import OrderedDict
 

tests/offline/Assets/sample_accept_sale.xml

@@ -1,11 +1,19 @@
-<saleacceptanceresult xmlns="http://www.priceminister.com/sales_ws/saleacceptance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.priceminister.com/sales_ws/saleacceptance http://www.priceminister.com/res/co/0/www/www/56991/2010-09-20sale_acceptance.xsd">
-    <request>
-        <user>vendeur</user>
-        <version>2010-09-20</version>
-        <itemid>1046920728</itemid>
+<saleacceptanceresult xmlns="https://fr.shopping.rakuten.com/res/schema/acceptsale" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://fr.shopping.rakuten.com/res/schema/acceptsale https://fr.shopping.rakuten.com/res/schema/acceptsale/accept_sale.2021-04-08.xsd">
+<request>
+        <version>2021-04-08</version>
+        <user>uuyu</user>
+        <itemid>589871029</itemid>
+        <shippingfromcountry>156</shippingfromcountry>
+        <importcountry>56</importcountry>
     </request>
     <response>
-        <lastversion>2010-09-20</lastversion>
-        <status>Refused</status>
+        <lastversion>2021-04-08</lastversion>
+        <status>Accepted</status>
+        <shippingfromcountry>156</shippingfromcountry>
+        <importcountry>56</importcountry>
+        <onestopshop>
+		<type>myOSSType</type>
+		<value>myOSSValue</value>
+        </onestopshop>
     </response>
-</saleacceptanceresult>	
+</saleacceptanceresult>	

tests/offline/__init__.py

@@ -1,5 +1,4 @@
 # coding: utf-8
-from __future__ import unicode_literals, print_function
 import os
 import pytest
 

tests/offline/test_accountingmanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.accountingmanagement import AccountingManagement
 from shiba.shibaconnection import ShibaConnection
 

tests/offline/test_inventorymanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os.path as op
 from shiba.inventorymanagement import InventoryManagement
 from shiba.shibaconnection import ShibaConnection

tests/offline/test_marketplacemanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.marketplacemanagement import MarketplaceManagement
 from shiba.shibaconnection import ShibaConnection
 

tests/offline/test_salesmanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.salesmanagement import SalesManagement
 from shiba.shibaconnection import ShibaConnection
 from shiba.shibaexceptions import (
@@ -34,16 +32,18 @@ def test_accept_sale(monkeypatch):
         ShibaConnection("test", "test", "https://ws.fr.shopping.rakuten.com")
     )
     itemid = "000000"
+    shippingfromcountry = "CN"
     obj = None
     try:
-        obj = sales_management.accept_sale(itemid)
+        obj = sales_management.accept_sale(itemid, shippingfromcountry)
     except ShibaServiceError:
         pass
     except ShibaParameterError:
         pass
     assert obj is not None
 
 
+
 def test_refuse_sale(monkeypatch):
     """Only fail result, as refusing an actual sale is not simulable"""
     monkeypatch.setattr(

tests/offline/test_shibatools.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os.path as op
 import xmltodict
 

tests/online/__init__.py

@@ -1,6 +1,4 @@
 # coding: utf-8
-from __future__ import unicode_literals, print_function
-
 import pytest
 
 from contextlib import contextmanager

tests/online/conftest.py

@@ -1,6 +1,4 @@
 # coding: utf-8
-from __future__ import unicode_literals, print_function
-
 import os
 
 import pytest

tests/online/test_accountingmanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.accountingmanagement import AccountingManagement
 from shiba.shibaexceptions import ShibaParameterError
 

tests/online/test_inventorymanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.shibaexceptions import ShibaRightsError
 from shiba.inventorymanagement import InventoryManagement
 

tests/online/test_marketplacemanagement.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-from __future__ import unicode_literals
-
 from shiba.marketplacemanagement import MarketplaceManagement
 from shiba.shibaexceptions import *
 

tests/online/test_salesmanagement.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.salesmanagement import SalesManagement
 from shiba.shibaexceptions import *
 
@@ -16,9 +14,10 @@ def test_accept_sale(connection):
     """Only fail result, as accepting an actual sale is not simulable"""
     sales_management = SalesManagement(connection)
     itemid = "000000"
+    shippingfromcountry = "CN"
     obj = None
     try:
-        obj = sales_management.accept_sale(itemid)
+        obj = sales_management.accept_sale(itemid, shippingfromcountry)
     except ShibaServiceError:
         pass
     except ShibaParameterError:

tests/online/test_shibatools.py

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shiba.shibatools import (
     inf_constructor,
     retrieve_obj_from_url,