Merge lp:~camptocamp/carriers-deliveries/7.0-change-class-name-to-avoid-error_rde into lp:~stock-logistic-core-editors/carriers-deliveries/7.0

[Romain Deheele - Camptocamp]

Hi,

In base_delivery_carrier_files_document, file carrier_file.py,
by coincidence, the class and a frequently used parameter are both named "carrier_file".
in l.61, the super method will take carrier_file parameter while it needs carrier_file, the class name.
It causes logically the error : TypeError: 'must be type, not browse_record'

Great catch from Leonardo Pistone, thank you.

Regards,

Romain

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Leonardo Pistone (lepistone)]

thanks

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

A frequent problem if you put a common python class name...

Thanks for the patch.

Regards.

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

Maybe take the occasion to switch the affected code to the Python convention for CapCase class names, which prevents this problem? http://legacy.python.org/dev/peps/pep-0008/#class-names

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

+1 for Stefan comment

[Leonardo Pistone (lepistone)]

I abstain on Stefan's remark.

I would love to see python conventions like that one to be used. The habit to have in OpenERP the class name with underscores is perhaps because normally that makes the class name correspond to the table name (in fact, the table name is _name with dots changed to underscores).

[Stefan Rijnhart (Opener) (stefan-opener)]

Sure, but the mapping from class 'CarrierFile' (instead of 'carrier_file') to model 'carrier.file' is still equally obvious.

[Leonardo Pistone (lepistone)]

Stefan, what I mean is that I prefer CamelCase too, but I abstain here because SA uses underscores all over the place.

[lp:~camptocamp/carriers-deliveries/7.0-change-class-name-to-avoid-error_rde]

42. By Romain Deheele - Camptocamp on 2014-04-03

[UPD] class name : switch with CapWords convention

[Romain Deheele - Camptocamp (romaindeheele)]

ok for CapWords convention, thanks Stefan.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for taking my suggestion!

review: Approve

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve

=== modified file 'base_delivery_carrier_files_document/carrier_file.py'
--- base_delivery_carrier_files_document/carrier_file.py	2014-03-27 14:49:41 +0000
+++ base_delivery_carrier_files_document/carrier_file.py	2014-04-03 16:45:52 +0000
@@ -24,11 +24,11 @@
 from openerp.osv import orm, fields
 
 
-class carrier_file(orm.Model):
+class CarrierFile(orm.Model):
     _inherit = 'delivery.carrier.file'
 
     def get_write_mode_selection(self, cr, uid, context=None):
-        res = super(carrier_file, self).\
+        res = super(CarrierFile, self).\
             get_write_mode_selection(cr, uid, context=context)
         if 'document' not in res:
             res.append(('document', 'Document'))
@@ -58,6 +58,6 @@
             self.pool['ir.attachment'].create(cr, uid, vals, context=context)
             return True
         else:
-            return (super(carrier_file, self)
+            return (super(CarrierFile, self)
                     ._write_file(cr, uid, carrier_file, filename, file_content,
                                  context=None))