Commit b79c67cf authored by Jérome Perrin's avatar Jérome Perrin

*: fix used-before-assignment and possibly-used-before-assignment from pylint 3.2.0

parent 8546ac86
Pipeline #34575 failed with stage
in 0 seconds
......@@ -64,35 +64,35 @@ line_list = context.AccountingTransaction_getAccountingTransactionLineList(
if not cancellation_amount:
line_list.reverse()
# guess portal_type to create lines
if line_list:
# guess portal_type to create lines
line_portal_type = line_list[0].getPortalType()
for line in line_list:
new_line = reversal.newContent( portal_type=line_portal_type )
new_line.edit(
source=line.getSource(portal_type='Account'),
destination=line.getDestination(portal_type='Account'),
quantity= - line.getQuantity(), )
if line.getSourceTotalAssetPrice():
new_line.setSourceTotalAssetPrice( - line.getSourceTotalAssetPrice() )
if line.getDestinationTotalAssetPrice():
new_line.setDestinationTotalAssetPrice(
- line.getDestinationTotalAssetPrice() )
new_line.setCancellationAmount(cancellation_amount)
# copy some values if they are defined explicitly on line
for prop in [ 'source_section', 'destination_section',
'source_payment', 'destination_payment',
'source_project', 'destination_project',
'source_function', 'destination_function',
'source_funding', 'destination_funding',
'source_payment_request', 'destination_payment_request',
'resource', 'product_line', 'string_index' ]:
if line.getProperty(prop) != context.getProperty(prop):
new_line.setProperty(prop, line.getProperty(prop))
for line in line_list:
new_line = reversal.newContent( portal_type=line_portal_type )
new_line.edit(
source=line.getSource(portal_type='Account'),
destination=line.getDestination(portal_type='Account'),
quantity= - line.getQuantity(), )
if line.getSourceTotalAssetPrice():
new_line.setSourceTotalAssetPrice( - line.getSourceTotalAssetPrice() )
if line.getDestinationTotalAssetPrice():
new_line.setDestinationTotalAssetPrice(
- line.getDestinationTotalAssetPrice() )
new_line.setCancellationAmount(cancellation_amount)
# copy some values if they are defined explicitly on line
for prop in [ 'source_section', 'destination_section',
'source_payment', 'destination_payment',
'source_project', 'destination_project',
'source_function', 'destination_function',
'source_funding', 'destination_funding',
'source_payment_request', 'destination_payment_request',
'resource', 'product_line', 'string_index' ]:
if line.getProperty(prop) != context.getProperty(prop):
new_line.setProperty(prop, line.getProperty(prop))
if plan:
reversal.plan()
......
......@@ -55,6 +55,7 @@ shopping_cart_items = context.SaleOrder_getShoppingCartItemList()
# get category like size and variation
category = request.form.get('field_variation_box_your_category', '')
base_category = ''
if category:
[base_category, category] = category.split('/', 1)
variation = request.form.get('field_variation_box_your_variation', None)
......
......@@ -37,8 +37,7 @@ else:
variation_dict["start_date"] = date
variation_dict["stop_date"] = date+0.00001
if web_site_value is not None:
price_currency_value = web_site_value.WebSite_getShoppingCartDefaultCurrency()
price_currency_value = web_site_value.WebSite_getShoppingCartDefaultCurrency()
movement = context.newContent(
temp_object=True,
......
......@@ -28,6 +28,8 @@ elif aggregation_level == "week":
sql_format = "%Y-%u"
elif aggregation_level == "day":
sql_format = "%Y-%m-%d"
else:
raise ValueError("Unsupported aggregation level %s" % aggregation_level)
if to_date is not None:
to_date = atTheEndOfPeriod(to_date, period=aggregation_level)
count_kw = {}
......
......@@ -29,9 +29,10 @@ import io
import six
if six.PY3:
long = int # pylint:disable=redefined-builtin
long_or_int = int
from email.generator import _make_boundary as choose_boundary
else:
long_or_int = long
from mimetools import choose_boundary # pylint:disable=import-error
class BigFile(File):
......@@ -193,13 +194,13 @@ class BigFile(File):
else:
# Date
date = if_range.split( ';')[0]
try: mod_since=long(DateTime(date).timeTime())
try: mod_since=long_or_int(DateTime(date).timeTime())
except Exception: mod_since=None
if mod_since is not None:
last_mod = self._data_mtime()
if last_mod is None:
last_mod = 0
last_mod = long(last_mod)
last_mod = long_or_int(last_mod)
if last_mod > mod_since:
# Modified, so send a normal response. We delete
# the ranges, which causes us to skip to the 200
......
......@@ -76,6 +76,7 @@ class CategoriesSpreadsheetConfiguratorItem(ConfiguratorItemMixin, XMLObject):
# the bc should be added as base category in bt5 ?
error_list.append(self._createConstraintMessage(
"Base Category %s should be created" % bc_id))
continue
if fixit:
bc = ctool.newContent(id=bc_id)
......
......@@ -228,6 +228,7 @@ class ConfiguratorTool(BaseTool):
return response
## show next form in transitions
html = None
rendered = False
while rendered is False:
if need_validation == 1:
......
......@@ -21,7 +21,7 @@ if line_portal_type in portal.getPortalSaleTypeList():
section_uid = context.getSourceSectionUid()
elif line_portal_type in portal.getPortalPurchaseTypeList():
section_uid = context.getDestinationSectionUid()
elif line_portal_type in portal.getPortalInternalTypeList() + portal.getPortalInventoryMovementTypeList():
else:
section_uid = None
len_line_list = len(line_list)
used_id = [] # list use to make sure we do not generate two line with same id/uid
......
......@@ -29,6 +29,7 @@ for line in listbox:
product = source_document.getResourceValue()
else:
source_document = None
product = None
# update original line/cell if given
if source_document is not None:
......
......@@ -43,6 +43,7 @@ elif line_portal_type in portal.getPortalInternalTypeList():
elif line_portal_type in portal.getPortalInventoryMovementTypeList():
section_uid = None
no_inventory = True
supply_cell_portal_type = supply_line_id = None
use_list = portal.portal_preferences.getPreferredPurchaseUseList() \
+ portal.portal_preferences.getPreferredSaleUseList()
else:
......
......@@ -51,6 +51,8 @@ elif aggregation_level == "week":
date_format = "%Y-%U"
elif aggregation_level == "day":
date_format = "%Y-%m-%d"
else:
raise ValueError("Unsupported aggregation_level: %s" % aggregation_level)
if from_date is not None and at_date is not None:
catalog_params['delivery.start_date'] = {
......
......@@ -253,6 +253,7 @@ if force_base_url:
root_url = "/".join(base_url.split("/", 3)[:3])
if root_url != base_url:
base_url = "/".join(base_url.split("/")[:-1])
request_protocol = 'https:'
else:
request_protocol = context.REQUEST.SERVER_URL.split(":", 1)[0] + ":"
root_url = base_url_root_object.absolute_url()
......
......@@ -986,7 +986,8 @@ class ImmobilisableItem(Item, Amount):
raw_annuity_price = annuity_start_price * current_ratio
elif price_calculation_basis == "period recalculated start price":
raw_annuity_price = local_period_start_price * current_ratio
else:
raise ValueError("Unsupported price_calculation_basis: %s" % price_calculation_basis)
# Apply the prorata temporis on the raw annuity value
if annuity_number and \
price_calculation_basis == 'period recalculated start price' and \
......
......@@ -271,7 +271,7 @@ class AmountGeneratorMixin:
- is rounding really well supported (ie. before and after aggregation)
very likely not - proxying before or after must be decided
"""
# pylint:disable=self-cls-assignment
# pylint:disable=self-cls-assignment,possibly-used-before-assignment
# It is the only place where we can import this
portal = self.getPortalObject()
getRoundingProxy = portal.portal_roundings.getRoundingProxy
......
......@@ -87,7 +87,7 @@ class _Policy(six.with_metaclass(_PolicyMetaClass, object)):
if attr == 'merge_parent':
self.merge_parent = value = self.context.getRootAppliedRule().getPath()
else:
object.__getattribute__(self, attr)
value = object.__getattribute__(self, attr)
return value
def deferAll(self):
......
......@@ -8,6 +8,7 @@ request=context.REQUEST
# We stop doing this
#base_category = context.getBaseCategoryId()
base_category = None
redirect_url = None
o = context.restrictedTraverse(object_path)
......
......@@ -42,7 +42,7 @@ skin_id_list = context.getTemplateSkinIdList()
if skin_id_list:
if bt_title in skin_id_list:
main_skin_id = bt_title
elif skin_id_list:
else:
main_skin_id = skin_id_list[0]
form_path = '%s/%s' % (main_skin_id, field_library_id)
form = getForm(portal.portal_skins[main_skin_id], field_library_id)
......
......@@ -8,56 +8,61 @@ class CompatibilityDisableChecker(checkers.BaseChecker):
name = "compatibility-disable"
msgs = {
"E9990": (
"E9999": (
"not-an-iterable",
"not-an-iterable",
"",
),
"E9991": (
"E9998": (
"misplaced-bare-raise",
"misplaced-bare-raise",
"",
),
"W9992": (
"E9997": (
"unused-private-member",
"unused-private-member",
"",
),
"E9993": (
"E9996": (
"using-constant-test",
"using-constant-test",
""
),
"E9994": (
"E9995": (
"modified-iterating-list",
"modified-iterating-list",
"",
),
"E9995": (
"E9994": (
"unsubscriptable-object",
"unsubscriptable-object",
"",
),
"E9996": (
"E9993": (
"invalid-unary-operand-type",
"invalid-unary-operand-type",
"",
),
"E9997": (
"E9992": (
"unbalanced-dict-unpacking",
"unbalanced-dict-unpacking",
"",
),
"E9998": (
"E9991": (
"self-cls-assignment",
"self-cls-assignment",
"",
),
"E9999": (
"E9990": (
"deprecated-class",
"deprecated-class",
"",
),
"E9989": (
"possibly-used-before-assignment",
"possibly-used-before-assignment",
""
)
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment