changeset 6adb8cca152f in modules/sale_supply_drop_shipment:default
details:
https://hg.tryton.org/modules/sale_supply_drop_shipment?cmd=changeset;node=6adb8cca152f
description:
Fix flake8 errors and warnings
We add the flake8 configuration used so we ensure everyone uses the
same.
We remove the usage of __all__ for non public API.
When possible, we rationalize the class name according to its __name__
and module.
issue9082
review297061002
diffstat:
.flake8 | 2 ++
__init__.py | 22 +++++++++++-----------
party.py | 10 ++++------
purchase.py | 28 +++++++++++-----------------
sale.py | 16 +++++++---------
setup.py | 7 ++++---
stock.py | 3 ---
tests/__init__.py | 2 +-
8 files changed, 40 insertions(+), 50 deletions(-)
diffs (301 lines):
diff -r 4759b900c3a1 -r 6adb8cca152f .flake8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.flake8 Sun Mar 01 12:33:54 2020 +0100
@@ -0,0 +1,2 @@
+[flake8]
+ignore=E123,E124,E126,E128,W503
diff -r 4759b900c3a1 -r 6adb8cca152f __init__.py
--- a/__init__.py Mon Jan 20 11:29:17 2020 +0100
+++ b/__init__.py Sun Mar 01 12:33:54 2020 +0100
@@ -14,20 +14,20 @@
stock.ConfigurationSequence,
stock.ShipmentDrop,
stock.Move,
- sale.SaleConfig,
- sale.SaleConfigSaleDropLocation,
+ sale.Configuration,
+ sale.ConfigurationSaleDropLocation,
sale.Sale,
- sale.SaleLine,
- purchase.PurchaseRequest,
- purchase.PurchaseConfig,
- purchase.PurchaseConfigPurchaseDropLocation,
+ sale.Line,
+ purchase.Request,
+ purchase.Configuration,
+ purchase.ConfigurationPurchaseDropLocation,
purchase.Purchase,
- purchase.PurchaseLine,
+ purchase.Line,
purchase.ProductSupplier,
module='sale_supply_drop_shipment', type_='model')
Pool.register(
- purchase.CreatePurchase,
- purchase.PurchaseHandleShipmentException,
- party.PartyReplace,
- party.PartyErase,
+ purchase.RequestCreatePurchase,
+ purchase.HandleShipmentException,
+ party.Replace,
+ party.Erase,
module='sale_supply_drop_shipment', type_='wizard')
diff -r 4759b900c3a1 -r 6adb8cca152f party.py
--- a/party.py Mon Jan 20 11:29:17 2020 +0100
+++ b/party.py Sun Mar 01 12:33:54 2020 +0100
@@ -5,15 +5,13 @@
from trytond.modules.party.exceptions import EraseError
-__all__ = ['PartyReplace', 'PartyErase']
-
-class PartyReplace(metaclass=PoolMeta):
+class Replace(metaclass=PoolMeta):
__name__ = 'party.replace'
@classmethod
def fields_to_replace(cls):
- return super(PartyReplace, cls).fields_to_replace() + [
+ return super().fields_to_replace() + [
('purchase.request', 'customer'),
('purchase.purchase', 'customer'),
('stock.shipment.drop', 'supplier'),
@@ -21,13 +19,13 @@
]
-class PartyErase(metaclass=PoolMeta):
+class Erase(metaclass=PoolMeta):
__name__ = 'party.erase'
def check_erase_company(self, party, company):
pool = Pool()
ShipmentDrop = pool.get('stock.shipment.drop')
- super(PartyErase, self).check_erase_company(party, company)
+ super().check_erase_company(party, company)
shipments = ShipmentDrop.search([
['OR',
diff -r 4759b900c3a1 -r 6adb8cca152f purchase.py
--- a/purchase.py Mon Jan 20 11:29:17 2020 +0100
+++ b/purchase.py Sun Mar 01 12:33:54 2020 +0100
@@ -14,15 +14,11 @@
from trytond.modules.purchase.purchase import (
get_shipments_returns, search_shipments_returns)
-
-__all__ = ['PurchaseRequest', 'PurchaseConfig',
- 'PurchaseConfigPurchaseDropLocation', 'Purchase', 'PurchaseLine',
- 'ProductSupplier', 'CreatePurchase', 'PurchaseHandleShipmentException']
purchase_drop_location = fields.Many2One(
'stock.location', "Purchase Drop Location", domain=[('type', '=', 'drop')])
-class PurchaseRequest(metaclass=PoolMeta):
+class Request(metaclass=PoolMeta):
__name__ = 'purchase.request'
customer = fields.Many2One('party.party', 'Customer', readonly=True,
@@ -38,7 +34,7 @@
depends=['customer', 'state'])
-class PurchaseConfig(metaclass=PoolMeta):
+class Configuration(metaclass=PoolMeta):
__name__ = 'purchase.configuration'
purchase_drop_location = fields.MultiValue(purchase_drop_location)
@@ -49,7 +45,7 @@
'purchase_drop_location').default_purchase_drop_location()
-class PurchaseConfigPurchaseDropLocation(ModelSQL, ValueMixin):
+class ConfigurationPurchaseDropLocation(ModelSQL, ValueMixin):
"Purchase Configuration Purchase Drop Location"
__name__ = 'purchase.configuration.purchase_drop_location'
purchase_drop_location = purchase_drop_location
@@ -58,8 +54,7 @@
def __register__(cls, module_name):
exist = backend.TableHandler.table_exist(cls._table)
- super(PurchaseConfigPurchaseDropLocation, cls).__register__(
- module_name)
+ super().__register__(module_name)
if not exist:
cls._migrate_property([], [], [])
@@ -172,11 +167,11 @@
)
-class PurchaseLine(metaclass=PoolMeta):
+class Line(metaclass=PoolMeta):
__name__ = 'purchase.line'
def get_to_location(self, name):
- result = super(PurchaseLine, self).get_to_location(name)
+ result = super().get_to_location(name)
if self.purchase.customer:
return self.purchase.drop_location.id
return result
@@ -184,7 +179,7 @@
def get_move(self, move_type):
pool = Pool()
Currency = pool.get('currency.currency')
- move = super(PurchaseLine, self).get_move(move_type)
+ move = super().get_move(move_type)
if move and self.purchase.customer:
digits = move.__class__.cost_price.digits
cost_price = Currency.compute(
@@ -213,13 +208,12 @@
return self.product.supply_on_sale
-class CreatePurchase(metaclass=PoolMeta):
+class RequestCreatePurchase(metaclass=PoolMeta):
__name__ = 'purchase.request.create_purchase'
@classmethod
def _group_purchase_key(cls, requests, request):
- result = super(CreatePurchase, cls)._group_purchase_key(requests,
- request)
+ result = super()._group_purchase_key(requests, request)
result += (
('customer', request.customer.id if request.customer else None),
('delivery_address', request.delivery_address.id
@@ -228,7 +222,7 @@
return result
-class PurchaseHandleShipmentException(metaclass=PoolMeta):
+class HandleShipmentException(metaclass=PoolMeta):
__name__ = 'purchase.handle.shipment.exception'
def transition_handle(self):
@@ -237,7 +231,7 @@
Purchase = pool.get('purchase.purchase')
Move = pool.get('stock.move')
- super(PurchaseHandleShipmentException, self).transition_handle()
+ super().transition_handle()
sales = set()
moves = set()
diff -r 4759b900c3a1 -r 6adb8cca152f sale.py
--- a/sale.py Mon Jan 20 11:29:17 2020 +0100
+++ b/sale.py Sun Mar 01 12:33:54 2020 +0100
@@ -10,12 +10,11 @@
from trytond.modules.sale.sale import (
get_shipments_returns, search_shipments_returns)
-__all__ = ['SaleConfig', 'SaleConfigSaleDropLocation', 'Sale', 'SaleLine']
sale_drop_location = fields.Many2One(
'stock.location', "Sale Drop Location", domain=[('type', '=', 'drop')])
-class SaleConfig(metaclass=PoolMeta):
+class Configuration(metaclass=PoolMeta):
__name__ = 'sale.configuration'
sale_drop_location = fields.MultiValue(sale_drop_location)
@@ -26,7 +25,7 @@
'sale_drop_location').default_sale_drop_location()
-class SaleConfigSaleDropLocation(ModelSQL, ValueMixin):
+class ConfigurationSaleDropLocation(ModelSQL, ValueMixin):
"Sale Configuration Sale Drop Location"
__name__ = 'sale.configuration.sale_drop_location'
sale_drop_location = sale_drop_location
@@ -35,8 +34,7 @@
def __register__(cls, module_name):
exist = backend.TableHandler.table_exist(cls._table)
- super(SaleConfigSaleDropLocation, cls).__register__(
- module_name)
+ super().__register__(module_name)
if not exist:
cls._migrate_property([], [], [])
@@ -101,12 +99,12 @@
Move.save(moves)
-class SaleLine(metaclass=PoolMeta):
+class Line(metaclass=PoolMeta):
__name__ = 'sale.line'
@property
def supply_on_sale(self):
- supply_on_sale = super(SaleLine, self).supply_on_sale
+ supply_on_sale = super().supply_on_sale
return (supply_on_sale
or (self.moves and all(m.from_location.type == 'drop'
for m in self.moves)))
@@ -127,7 +125,7 @@
return True
def get_move(self, shipment_type):
- result = super(SaleLine, self).get_move(shipment_type)
+ result = super().get_move(shipment_type)
if (shipment_type == 'out'
and not Transaction().context.get('_drop_shipment')):
if self.supply_on_sale_drop_move:
@@ -135,7 +133,7 @@
return result
def get_purchase_request(self):
- request = super(SaleLine, self).get_purchase_request()
+ request = super().get_purchase_request()
if request and request.party:
if self.product and self.product.type in ('goods', 'assets'):
product_supplier = request.find_best_product_supplier(
diff -r 4759b900c3a1 -r 6adb8cca152f setup.py
--- a/setup.py Mon Jan 20 11:29:17 2020 +0100
+++ b/setup.py Sun Mar 01 12:33:54 2020 +0100
@@ -80,8 +80,8 @@
keywords='tryton sale supply drop shipment',
package_dir={'trytond.modules.sale_supply_drop_shipment': '.'},
packages=(
- ['trytond.modules.sale_supply_drop_shipment'] +
- ['trytond.modules.sale_supply_drop_shipment.%s' % p
+ ['trytond.modules.sale_supply_drop_shipment']
+ + ['trytond.modules.sale_supply_drop_shipment.%s' % p
for p in find_packages()]
),
package_data={
@@ -95,7 +95,8 @@
'Intended Audience :: Developers',
'Intended Audience :: Financial and Insurance Industry',
'Intended Audience :: Legal Industry',
- 'License :: OSI Approved :: GNU General Public License v3 or later
(GPLv3+)',
+ 'License :: OSI Approved :: '
+ 'GNU General Public License v3 or later (GPLv3+)',
'Natural Language :: Bulgarian',
'Natural Language :: Catalan',
'Natural Language :: Chinese (Simplified)',
diff -r 4759b900c3a1 -r 6adb8cca152f stock.py
--- a/stock.py Mon Jan 20 11:29:17 2020 +0100
+++ b/stock.py Sun Mar 01 12:33:54 2020 +0100
@@ -20,9 +20,6 @@
from trytond.modules.purchase.stock import process_purchase
-__all__ = ['Configuration', 'ConfigurationSequence', 'ShipmentDrop', 'Move']
-
-
class Configuration(metaclass=PoolMeta):
__name__ = 'stock.configuration'
diff -r 4759b900c3a1 -r 6adb8cca152f tests/__init__.py
--- a/tests/__init__.py Mon Jan 20 11:29:17 2020 +0100
+++ b/tests/__init__.py Sun Mar 01 12:33:54 2020 +0100
@@ -2,7 +2,7 @@
# this repository contains the full copyright notices and license terms.
try:
- from
trytond.modules.sale_supply_drop_shipment.tests.test_sale_supply_drop_shipment
import suite
+ from
trytond.modules.sale_supply_drop_shipment.tests.test_sale_supply_drop_shipment
import suite # noqa: E501
except ImportError:
from .test_sale_supply_drop_shipment import suite
