Merge lp:~vauxoo/addons-vauxoo/7.0-fix-full-path-import-dev-moylop260 into lp:addons-vauxoo/7.0
- 7.0-fix-full-path-import-dev-moylop260
- Merge into 7.0
Proposed by
Moisés López - http://www.vauxoo.com
Status: | Merged |
---|---|
Merged at revision: | 1145 |
Proposed branch: | lp:~vauxoo/addons-vauxoo/7.0-fix-full-path-import-dev-moylop260 |
Merge into: | lp:addons-vauxoo/7.0 |
Diff against target: |
975 lines (+84/-84) 74 files modified
account_bank_statement_vauxoo/model/account_bank_statement.py (+1/-1) account_move_line_dp_product/account_move_line.py (+1/-1) account_move_report/report/account_move_html.py (+1/-1) account_move_sum_all_credits_debits/account.py (+1/-1) account_voucher_tax/account_voucher.py (+1/-1) afr_webkit/wizard/afr_report_wizard.py (+2/-2) aging_due_report/report/parser.py (+2/-2) bank_iva_report/report/report_voucher_amount.py (+1/-1) bank_print_report/report/check.py (+1/-1) baremo/baremo.py (+1/-1) commission_payment/commission.py (+1/-1) cost_imex/model/percent_imex.py (+1/-1) cost_imex/model/purchase.py (+1/-1) cost_structure/model/cost_structure.py (+1/-1) cost_structure/model/product_product.py (+1/-1) crm_profile_reporting/report/crm_profile_report.py (+1/-1) debit_credit_note/wizard/account_invoice_refund.py (+2/-2) decimal_precision_currency/decimal_pre_currency.py (+1/-1) decimal_precision_tax/decimal_pre_tax.py (+1/-1) deliver_project/report/ir_module_reference_print.py (+1/-1) hr_salesman_commission/hr_salesman_commission.py (+1/-1) ifrs_report/model/account.py (+1/-1) ifrs_report/model/ifrs.py (+3/-3) ifrs_report/wizard/ifrs_report_wizard.py (+1/-1) inventory_stock_report/report/reporte_stock.py (+1/-1) inventory_stock_report/report/reporte_stock2.py (+1/-1) invoice_commission/invoice_commission.py (+1/-1) invoice_report_multicompany/report/account_print_invoice.py (+1/-1) invoice_report_per_journal/report/invoice_report_demo.py (+1/-1) l10n_ve_stock/report/stock_guia.py (+1/-1) l10n_ve_stock/report/stock_valued.py (+1/-1) late_payments_report/report/late_payments.py (+1/-1) ledger_report_partner/report/request_ledger_report.py (+1/-1) m321_customization/invoice.py (+1/-1) m321_reports/report/amd_computadoras_report.py (+1/-1) m321_reports/report/amd_computer_shop_report.py (+1/-1) m321_reports/report/comercializadora_m321_report.py (+1/-1) m321_reports/report/computacion_activa_report.py (+1/-1) mrp_advance/mrp_bom_cost/mrp.py (+1/-1) mrp_bom_subproduct_cost/mrp_subproduct.py (+1/-1) mrp_consume_produce/wizard/mrp_consume_produce.py (+1/-1) mrp_production_bom_related/mrp.py (+1/-1) mrp_pt_planified/mrp.py (+1/-1) mrp_request_return/wizard/mrp_request_return.py (+1/-1) mrp_subproduction/mrp.py (+1/-1) mrp_variation/mrp_variation.py (+1/-1) mrp_webkit_report_wizard/report/report_webkit_html.py (+1/-1) mrp_webkit_report_wizard/report/report_webkit_variation_group.py (+1/-1) openacademy/openacademy.py (+3/-3) openacademy/partner.py (+2/-2) openacademy/report/openacademy_course.py (+1/-1) openacademy/wizard/create_attendee_wizard.py (+2/-2) openerp_print/report_sxw.py (+1/-1) openerp_print/report_sxw_ext.py (+1/-1) partner_effective_sale/model/partner.py (+1/-1) picking_verification_report/report/picking.py (+1/-1) product_historical_price/product.py (+1/-1) project_issue_fix_progress/project.py (+1/-1) project_issue_report/report/project_issue_report.py (+1/-1) project_issue_report2/report/project_issue.py (+1/-1) project_task_work/report/parser.py (+1/-1) psm/report/picking.py (+1/-1) psm/wizard/pedigree_serialization_manager.py (+1/-1) report_move_voucher/report/account.py (+1/-1) report_process_production/report/process_production_report.py (+1/-1) report_profit/invoice.py (+1/-1) report_profit/product.py (+1/-1) report_profit/report/trial_cost.py (+1/-1) sale_commission/sale_commission.py (+1/-1) sale_uncommitted_product/model/product.py (+1/-1) stock_card/report_profit_picking.py (+1/-1) stock_card/stock_card.py (+1/-1) stock_kardex/kardex.py (+1/-1) user_story/report/user_story_report_mako.py (+2/-2) |
To merge this branch: | bzr merge lp:~vauxoo/addons-vauxoo/7.0-fix-full-path-import-dev-moylop260 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hbto [Vauxoo] http://www.vauxoo.com | Approve | ||
Nhomar - Vauxoo | Pending | ||
Review via email:
|
Commit message
Description of the change
[FIX] Change import to full path example:
before "import decimal_precision"
now "from openerp.
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'account_bank_statement_vauxoo/model/account_bank_statement.py' |
2 | --- account_bank_statement_vauxoo/model/account_bank_statement.py 2014-09-30 14:38:46 +0000 |
3 | +++ account_bank_statement_vauxoo/model/account_bank_statement.py 2014-10-03 04:38:05 +0000 |
4 | @@ -21,7 +21,7 @@ |
5 | ############################################################################## |
6 | |
7 | from openerp.osv import fields, osv |
8 | -import decimal_precision as dp |
9 | +from openerp.addons.decimal_precision import decimal_precision as dp |
10 | from openerp.tools.translate import _ |
11 | |
12 | # Excel Stuff |
13 | |
14 | === modified file 'account_move_line_dp_product/account_move_line.py' |
15 | --- account_move_line_dp_product/account_move_line.py 2014-09-29 18:26:50 +0000 |
16 | +++ account_move_line_dp_product/account_move_line.py 2014-10-03 04:38:05 +0000 |
17 | @@ -22,7 +22,7 @@ |
18 | ########################################################################## |
19 | |
20 | from openerp.osv import osv, fields |
21 | -import decimal_precision as dp |
22 | +from openerp.addons.decimal_precision import decimal_precision as dp |
23 | |
24 | |
25 | class account_move_line(osv.Model): |
26 | |
27 | === modified file 'account_move_report/report/account_move_html.py' |
28 | --- account_move_report/report/account_move_html.py 2014-09-29 18:26:50 +0000 |
29 | +++ account_move_report/report/account_move_html.py 2014-10-03 04:38:05 +0000 |
30 | @@ -22,7 +22,7 @@ |
31 | ################################################################################ |
32 | from openerp.report import report_sxw |
33 | import time |
34 | -from report_webkit import webkit_report |
35 | +from openerp.addons.report_webkit import webkit_report |
36 | |
37 | class account_move_report_html(report_sxw.rml_parse): |
38 | def __init__(self, cr, uid, name, context): |
39 | |
40 | === modified file 'account_move_sum_all_credits_debits/account.py' |
41 | --- account_move_sum_all_credits_debits/account.py 2014-09-29 18:26:50 +0000 |
42 | +++ account_move_sum_all_credits_debits/account.py 2014-10-03 04:38:05 +0000 |
43 | @@ -26,7 +26,7 @@ |
44 | |
45 | |
46 | from openerp.osv import osv, fields |
47 | -import decimal_precision as dp |
48 | +from openerp.addons.decimal_precision import decimal_precision as dp |
49 | |
50 | |
51 | class account_move(osv.Model): |
52 | |
53 | === modified file 'account_voucher_tax/account_voucher.py' |
54 | --- account_voucher_tax/account_voucher.py 2014-09-30 14:38:46 +0000 |
55 | +++ account_voucher_tax/account_voucher.py 2014-10-03 04:38:05 +0000 |
56 | @@ -26,7 +26,7 @@ |
57 | |
58 | from openerp.osv import osv, fields |
59 | |
60 | -import decimal_precision as dp |
61 | +from openerp.addons.decimal_precision import decimal_precision as dp |
62 | |
63 | |
64 | |
65 | |
66 | === modified file 'afr_webkit/wizard/afr_report_wizard.py' |
67 | --- afr_webkit/wizard/afr_report_wizard.py 2014-09-29 18:26:50 +0000 |
68 | +++ afr_webkit/wizard/afr_report_wizard.py 2014-10-03 04:38:05 +0000 |
69 | @@ -25,8 +25,8 @@ |
70 | |
71 | |
72 | |
73 | -from osv import osv, fields |
74 | -from tools.translate import _ |
75 | +from openerp.osv import osv, fields |
76 | +from openerp.tools.translate import _ |
77 | |
78 | import logging |
79 | _logger = logging.getLogger(__name__) |
80 | |
81 | === modified file 'aging_due_report/report/parser.py' |
82 | --- aging_due_report/report/parser.py 2014-09-30 14:38:46 +0000 |
83 | +++ aging_due_report/report/parser.py 2014-10-03 04:38:05 +0000 |
84 | @@ -25,9 +25,9 @@ |
85 | |
86 | |
87 | import time |
88 | -from report import report_sxw |
89 | +from openerp.report import report_sxw |
90 | import mx.DateTime |
91 | -from report_webkit import webkit_report |
92 | +from openerp.addons.report_webkit import webkit_report |
93 | |
94 | |
95 | class aging_parser(report_sxw.rml_parse): |
96 | |
97 | === modified file 'bank_iva_report/report/report_voucher_amount.py' |
98 | --- bank_iva_report/report/report_voucher_amount.py 2014-09-30 14:38:46 +0000 |
99 | +++ bank_iva_report/report/report_voucher_amount.py 2014-10-03 04:38:05 +0000 |
100 | @@ -25,7 +25,7 @@ |
101 | # |
102 | ############################################################################## |
103 | import time |
104 | -from report import report_sxw |
105 | +from openerp.report import report_sxw |
106 | from tools import amount_to_text_en |
107 | from numero_a_texto import Numero_a_Texto |
108 | |
109 | |
110 | === modified file 'bank_print_report/report/check.py' |
111 | --- bank_print_report/report/check.py 2014-09-29 18:26:50 +0000 |
112 | +++ bank_print_report/report/check.py 2014-10-03 04:38:05 +0000 |
113 | @@ -30,7 +30,7 @@ |
114 | import time |
115 | from openerp_print import report_sxw_ext # nuevo |
116 | #~ from report_sxw_ext import report_sxw_ext #nuevo |
117 | -# from report import report_sxw #original |
118 | +from openerp.report import report_sxw #original |
119 | from numero_a_texto import Numero_a_Texto |
120 | |
121 | |
122 | |
123 | === modified file 'baremo/baremo.py' |
124 | --- baremo/baremo.py 2014-09-29 18:26:50 +0000 |
125 | +++ baremo/baremo.py 2014-10-03 04:38:05 +0000 |
126 | @@ -21,7 +21,7 @@ |
127 | ############################################################################## |
128 | from openerp.osv import fields, osv |
129 | |
130 | -import decimal_precision as dp |
131 | +from openerp.addons.decimal_precision import decimal_precision as dp |
132 | |
133 | |
134 | class baremo_book(osv.Model): |
135 | |
136 | === modified file 'commission_payment/commission.py' |
137 | --- commission_payment/commission.py 2014-09-30 14:38:46 +0000 |
138 | +++ commission_payment/commission.py 2014-10-03 04:38:05 +0000 |
139 | @@ -3,7 +3,7 @@ |
140 | |
141 | from openerp.tools.translate import _ |
142 | |
143 | -import decimal_precision as dp |
144 | +from openerp.addons.decimal_precision import decimal_precision as dp |
145 | |
146 | |
147 | class commission_payment(osv.Model): |
148 | |
149 | === modified file 'cost_imex/model/percent_imex.py' |
150 | --- cost_imex/model/percent_imex.py 2014-09-29 18:26:50 +0000 |
151 | +++ cost_imex/model/percent_imex.py 2014-10-03 04:38:05 +0000 |
152 | @@ -28,7 +28,7 @@ |
153 | from openerp.osv import fields, osv |
154 | |
155 | import time |
156 | -import decimal_precision as dp |
157 | +from openerp.addons.decimal_precision import decimal_precision as dp |
158 | |
159 | |
160 | class percent_imex(osv.Model): |
161 | |
162 | === modified file 'cost_imex/model/purchase.py' |
163 | --- cost_imex/model/purchase.py 2014-09-30 14:38:46 +0000 |
164 | +++ cost_imex/model/purchase.py 2014-10-03 04:38:05 +0000 |
165 | @@ -27,7 +27,7 @@ |
166 | ############################################################################### |
167 | from openerp.osv import fields, osv |
168 | |
169 | -import decimal_precision as dp |
170 | +from openerp.addons.decimal_precision import decimal_precision as dp |
171 | |
172 | |
173 | class inherit_purchase(osv.Model): |
174 | |
175 | === modified file 'cost_structure/model/cost_structure.py' |
176 | --- cost_structure/model/cost_structure.py 2014-09-29 18:26:50 +0000 |
177 | +++ cost_structure/model/cost_structure.py 2014-10-03 04:38:05 +0000 |
178 | @@ -25,7 +25,7 @@ |
179 | |
180 | from openerp.osv import osv, fields |
181 | |
182 | -import decimal_precision as dp |
183 | +from openerp.addons.decimal_precision import decimal_precision as dp |
184 | |
185 | |
186 | class cost_structure(osv.Model): |
187 | |
188 | === modified file 'cost_structure/model/product_product.py' |
189 | --- cost_structure/model/product_product.py 2014-09-29 18:26:50 +0000 |
190 | +++ cost_structure/model/product_product.py 2014-10-03 04:38:05 +0000 |
191 | @@ -26,7 +26,7 @@ |
192 | from openerp.osv import osv, fields |
193 | from openerp.tools.translate import _ |
194 | |
195 | -import decimal_precision as dp |
196 | +from openerp.addons.decimal_precision import decimal_precision as dp |
197 | from openerp.tools.sql import drop_view_if_exists |
198 | |
199 | |
200 | |
201 | === modified file 'crm_profile_reporting/report/crm_profile_report.py' |
202 | --- crm_profile_reporting/report/crm_profile_report.py 2014-09-29 18:26:50 +0000 |
203 | +++ crm_profile_reporting/report/crm_profile_report.py 2014-10-03 04:38:05 +0000 |
204 | @@ -1,6 +1,6 @@ |
205 | # -*- encoding: utf-8 -*- |
206 | import time |
207 | -from report import report_sxw |
208 | +from openerp.report import report_sxw |
209 | |
210 | |
211 | |
212 | |
213 | === modified file 'debit_credit_note/wizard/account_invoice_refund.py' |
214 | --- debit_credit_note/wizard/account_invoice_refund.py 2014-09-29 18:26:50 +0000 |
215 | +++ debit_credit_note/wizard/account_invoice_refund.py 2014-10-03 04:38:05 +0000 |
216 | @@ -20,8 +20,8 @@ |
217 | ############################################################################## |
218 | |
219 | |
220 | -from osv import osv |
221 | -from tools.translate import _ |
222 | +from openerp.osv import osv |
223 | +from openerp.tools.translate import _ |
224 | import netsvc |
225 | |
226 | |
227 | |
228 | === modified file 'decimal_precision_currency/decimal_pre_currency.py' |
229 | --- decimal_precision_currency/decimal_pre_currency.py 2014-09-29 18:26:50 +0000 |
230 | +++ decimal_precision_currency/decimal_pre_currency.py 2014-10-03 04:38:05 +0000 |
231 | @@ -25,7 +25,7 @@ |
232 | from openerp.osv import fields, osv |
233 | |
234 | import time |
235 | -import decimal_precision as dp |
236 | +from openerp.addons.decimal_precision import decimal_precision as dp |
237 | |
238 | |
239 | class res_currency_rate(osv.Model): |
240 | |
241 | === modified file 'decimal_precision_tax/decimal_pre_tax.py' |
242 | --- decimal_precision_tax/decimal_pre_tax.py 2014-09-29 18:26:50 +0000 |
243 | +++ decimal_precision_tax/decimal_pre_tax.py 2014-10-03 04:38:05 +0000 |
244 | @@ -25,7 +25,7 @@ |
245 | ############################################################################## |
246 | from openerp.osv import fields, osv |
247 | |
248 | -import decimal_precision as dp |
249 | +from openerp.addons.decimal_precision import decimal_precision as dp |
250 | |
251 | |
252 | class account_tax(osv.Model): |
253 | |
254 | === modified file 'deliver_project/report/ir_module_reference_print.py' |
255 | --- deliver_project/report/ir_module_reference_print.py 2014-05-09 21:51:34 +0000 |
256 | +++ deliver_project/report/ir_module_reference_print.py 2014-10-03 04:38:05 +0000 |
257 | @@ -21,7 +21,7 @@ |
258 | ############################################################################## |
259 | |
260 | import time |
261 | -from report import report_sxw |
262 | +from openerp.report import report_sxw |
263 | |
264 | |
265 | class ir_module_reference_print(report_sxw.rml_parse): |
266 | |
267 | === modified file 'hr_salesman_commission/hr_salesman_commission.py' |
268 | --- hr_salesman_commission/hr_salesman_commission.py 2014-09-29 18:26:50 +0000 |
269 | +++ hr_salesman_commission/hr_salesman_commission.py 2014-10-03 04:38:05 +0000 |
270 | @@ -1,6 +1,6 @@ |
271 | from openerp.osv import osv, fields |
272 | |
273 | -import decimal_precision as dp |
274 | +from openerp.addons.decimal_precision import decimal_precision as dp |
275 | |
276 | |
277 | |
278 | |
279 | === modified file 'ifrs_report/model/account.py' |
280 | --- ifrs_report/model/account.py 2014-09-29 18:26:50 +0000 |
281 | +++ ifrs_report/model/account.py 2014-10-03 04:38:05 +0000 |
282 | @@ -24,7 +24,7 @@ |
283 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
284 | ########################################################################## |
285 | |
286 | -from osv import osv |
287 | +from openerp.osv import osv |
288 | import mx.DateTime |
289 | import time |
290 | |
291 | |
292 | === modified file 'ifrs_report/model/ifrs.py' |
293 | --- ifrs_report/model/ifrs.py 2014-09-30 14:38:46 +0000 |
294 | +++ ifrs_report/model/ifrs.py 2014-10-03 04:38:05 +0000 |
295 | @@ -24,9 +24,9 @@ |
296 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
297 | ########################################################################## |
298 | |
299 | -from osv import osv |
300 | -from osv import fields |
301 | -from tools.translate import _ |
302 | +from openerp.osv import osv |
303 | +from openerp.osv import fields |
304 | +from openerp.tools.translate import _ |
305 | #~ import pdb |
306 | |
307 | class ifrs_ifrs(osv.osv): |
308 | |
309 | === modified file 'ifrs_report/wizard/ifrs_report_wizard.py' |
310 | --- ifrs_report/wizard/ifrs_report_wizard.py 2014-09-29 18:26:50 +0000 |
311 | +++ ifrs_report/wizard/ifrs_report_wizard.py 2014-10-03 04:38:05 +0000 |
312 | @@ -21,7 +21,7 @@ |
313 | |
314 | import time |
315 | |
316 | -from osv import fields, osv |
317 | +from openerp.osv import fields, osv |
318 | |
319 | |
320 | class ifrs_report_wizard(osv.osv_memory): |
321 | |
322 | === modified file 'inventory_stock_report/report/reporte_stock.py' |
323 | --- inventory_stock_report/report/reporte_stock.py 2014-09-30 14:38:46 +0000 |
324 | +++ inventory_stock_report/report/reporte_stock.py 2014-10-03 04:38:05 +0000 |
325 | @@ -24,7 +24,7 @@ |
326 | ########################################################################## |
327 | |
328 | import time |
329 | -from report import report_sxw |
330 | +from openerp.report import report_sxw |
331 | |
332 | |
333 | class rep_conteo_stock(report_sxw.rml_parse): |
334 | |
335 | === modified file 'inventory_stock_report/report/reporte_stock2.py' |
336 | --- inventory_stock_report/report/reporte_stock2.py 2014-09-30 14:38:46 +0000 |
337 | +++ inventory_stock_report/report/reporte_stock2.py 2014-10-03 04:38:05 +0000 |
338 | @@ -24,7 +24,7 @@ |
339 | ########################################################################## |
340 | |
341 | import time |
342 | -from report import report_sxw |
343 | +from openerp.report import report_sxw |
344 | |
345 | |
346 | class rep_conteo_stock2(report_sxw.rml_parse): |
347 | |
348 | === modified file 'invoice_commission/invoice_commission.py' |
349 | --- invoice_commission/invoice_commission.py 2014-09-30 14:38:46 +0000 |
350 | +++ invoice_commission/invoice_commission.py 2014-10-03 04:38:05 +0000 |
351 | @@ -2,7 +2,7 @@ |
352 | from openerp.osv import fields, osv |
353 | from openerp.tools.translate import _ |
354 | |
355 | -import decimal_precision as dp |
356 | +from openerp.addons.decimal_precision import decimal_precision as dp |
357 | |
358 | |
359 | class invoice_commission(osv.Model): |
360 | |
361 | === modified file 'invoice_report_multicompany/report/account_print_invoice.py' |
362 | --- invoice_report_multicompany/report/account_print_invoice.py 2014-05-09 21:51:34 +0000 |
363 | +++ invoice_report_multicompany/report/account_print_invoice.py 2014-10-03 04:38:05 +0000 |
364 | @@ -20,7 +20,7 @@ |
365 | ############################################################################## |
366 | |
367 | import time |
368 | -from report import report_sxw |
369 | +from openerp.report import report_sxw |
370 | |
371 | |
372 | class account_invoice2(report_sxw.rml_parse): |
373 | |
374 | === modified file 'invoice_report_per_journal/report/invoice_report_demo.py' |
375 | --- invoice_report_per_journal/report/invoice_report_demo.py 2014-09-29 18:26:50 +0000 |
376 | +++ invoice_report_per_journal/report/invoice_report_demo.py 2014-10-03 04:38:05 +0000 |
377 | @@ -27,7 +27,7 @@ |
378 | ''' |
379 | |
380 | from openerp.report import report_sxw |
381 | -from report_webkit import webkit_report |
382 | +from openerp.addons.report_webkit import webkit_report |
383 | |
384 | |
385 | class invoice_report_demo_html(report_sxw.rml_parse): |
386 | |
387 | === modified file 'l10n_ve_stock/report/stock_guia.py' |
388 | --- l10n_ve_stock/report/stock_guia.py 2014-05-09 21:51:34 +0000 |
389 | +++ l10n_ve_stock/report/stock_guia.py 2014-10-03 04:38:05 +0000 |
390 | @@ -24,7 +24,7 @@ |
391 | ########################################################################## |
392 | |
393 | import time |
394 | -from report import report_sxw |
395 | +from openerp.report import report_sxw |
396 | |
397 | |
398 | class stock_valued(report_sxw.rml_parse): |
399 | |
400 | === modified file 'l10n_ve_stock/report/stock_valued.py' |
401 | --- l10n_ve_stock/report/stock_valued.py 2014-05-09 21:51:34 +0000 |
402 | +++ l10n_ve_stock/report/stock_valued.py 2014-10-03 04:38:05 +0000 |
403 | @@ -24,7 +24,7 @@ |
404 | ########################################################################## |
405 | |
406 | import time |
407 | -from report import report_sxw |
408 | +from openerp.report import report_sxw |
409 | |
410 | |
411 | class stock_valued(report_sxw.rml_parse): |
412 | |
413 | === modified file 'late_payments_report/report/late_payments.py' |
414 | --- late_payments_report/report/late_payments.py 2014-05-09 21:51:34 +0000 |
415 | +++ late_payments_report/report/late_payments.py 2014-10-03 04:38:05 +0000 |
416 | @@ -26,7 +26,7 @@ |
417 | import time |
418 | |
419 | |
420 | -from report import report_sxw |
421 | +from openerp.report import report_sxw |
422 | import pooler |
423 | |
424 | |
425 | |
426 | === modified file 'ledger_report_partner/report/request_ledger_report.py' |
427 | --- ledger_report_partner/report/request_ledger_report.py 2014-05-09 21:51:34 +0000 |
428 | +++ ledger_report_partner/report/request_ledger_report.py 2014-10-03 04:38:05 +0000 |
429 | @@ -23,7 +23,7 @@ |
430 | |
431 | |
432 | import time |
433 | -from report import report_sxw |
434 | +from openerp.report import report_sxw |
435 | from openerp.tools.translate import _ |
436 | |
437 | from account.report import common_report_header |
438 | |
439 | === modified file 'm321_customization/invoice.py' |
440 | --- m321_customization/invoice.py 2014-09-29 18:26:50 +0000 |
441 | +++ m321_customization/invoice.py 2014-10-03 04:38:05 +0000 |
442 | @@ -27,7 +27,7 @@ |
443 | ############################################################################### |
444 | from openerp.osv import fields, osv |
445 | |
446 | -import decimal_precision as dp |
447 | +from openerp.addons.decimal_precision import decimal_precision as dp |
448 | |
449 | |
450 | class inherited_invoice(osv.Model): |
451 | |
452 | === modified file 'm321_reports/report/amd_computadoras_report.py' |
453 | --- m321_reports/report/amd_computadoras_report.py 2014-09-29 18:26:50 +0000 |
454 | +++ m321_reports/report/amd_computadoras_report.py 2014-10-03 04:38:05 +0000 |
455 | @@ -22,7 +22,7 @@ |
456 | # You should have received a copy of the GNU General Public License # |
457 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # |
458 | ############################################################################ |
459 | -from report import report_sxw |
460 | +from openerp.report import report_sxw |
461 | |
462 | |
463 | class m321_c_report(report_sxw.rml_parse): |
464 | |
465 | === modified file 'm321_reports/report/amd_computer_shop_report.py' |
466 | --- m321_reports/report/amd_computer_shop_report.py 2014-09-29 18:26:50 +0000 |
467 | +++ m321_reports/report/amd_computer_shop_report.py 2014-10-03 04:38:05 +0000 |
468 | @@ -22,7 +22,7 @@ |
469 | # You should have received a copy of the GNU General Public License # |
470 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # |
471 | ############################################################################ |
472 | -from report import report_sxw |
473 | +from openerp.report import report_sxw |
474 | |
475 | |
476 | class m321_cs_report(report_sxw.rml_parse): |
477 | |
478 | === modified file 'm321_reports/report/comercializadora_m321_report.py' |
479 | --- m321_reports/report/comercializadora_m321_report.py 2014-09-30 14:38:46 +0000 |
480 | +++ m321_reports/report/comercializadora_m321_report.py 2014-10-03 04:38:05 +0000 |
481 | @@ -22,7 +22,7 @@ |
482 | # You should have received a copy of the GNU General Public License # |
483 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # |
484 | ############################################################################ |
485 | -from report import report_sxw |
486 | +from openerp.report import report_sxw |
487 | |
488 | |
489 | class cm321_report(report_sxw.rml_parse): |
490 | |
491 | === modified file 'm321_reports/report/computacion_activa_report.py' |
492 | --- m321_reports/report/computacion_activa_report.py 2014-09-29 18:26:50 +0000 |
493 | +++ m321_reports/report/computacion_activa_report.py 2014-10-03 04:38:05 +0000 |
494 | @@ -22,7 +22,7 @@ |
495 | # You should have received a copy of the GNU General Public License # |
496 | # along with this program. If not, see <http://www.gnu.org/licenses/>. # |
497 | ############################################################################ |
498 | -from report import report_sxw |
499 | +from openerp.report import report_sxw |
500 | |
501 | |
502 | class m321_ca_report(report_sxw.rml_parse): |
503 | |
504 | === modified file 'mrp_advance/mrp_bom_cost/mrp.py' |
505 | --- mrp_advance/mrp_bom_cost/mrp.py 2014-09-29 18:26:50 +0000 |
506 | +++ mrp_advance/mrp_bom_cost/mrp.py 2014-10-03 04:38:05 +0000 |
507 | @@ -25,7 +25,7 @@ |
508 | ############################################################################## |
509 | from openerp.osv import fields, osv |
510 | |
511 | -import decimal_precision as dp |
512 | +from openerp.addons.decimal_precision import decimal_precision as dp |
513 | |
514 | |
515 | class mrp_bom(osv.Model): |
516 | |
517 | === modified file 'mrp_bom_subproduct_cost/mrp_subproduct.py' |
518 | --- mrp_bom_subproduct_cost/mrp_subproduct.py 2014-09-29 18:26:50 +0000 |
519 | +++ mrp_bom_subproduct_cost/mrp_subproduct.py 2014-10-03 04:38:05 +0000 |
520 | @@ -26,7 +26,7 @@ |
521 | |
522 | from openerp.osv import osv, fields |
523 | |
524 | -import decimal_precision as dp |
525 | +from openerp.addons.decimal_precision import decimal_precision as dp |
526 | |
527 | |
528 | class mrp_subproduct(osv.Model): |
529 | |
530 | === modified file 'mrp_consume_produce/wizard/mrp_consume_produce.py' |
531 | --- mrp_consume_produce/wizard/mrp_consume_produce.py 2014-09-30 14:38:46 +0000 |
532 | +++ mrp_consume_produce/wizard/mrp_consume_produce.py 2014-10-03 04:38:05 +0000 |
533 | @@ -24,7 +24,7 @@ |
534 | # |
535 | # |
536 | from openerp.osv import osv, fields |
537 | -import decimal_precision as dp |
538 | +from openerp.addons.decimal_precision import decimal_precision as dp |
539 | from openerp.tools.translate import _ |
540 | |
541 | |
542 | |
543 | === modified file 'mrp_production_bom_related/mrp.py' |
544 | --- mrp_production_bom_related/mrp.py 2014-05-09 21:51:34 +0000 |
545 | +++ mrp_production_bom_related/mrp.py 2014-10-03 04:38:05 +0000 |
546 | @@ -24,7 +24,7 @@ |
547 | # |
548 | ############################################################################## |
549 | from openerp.osv import osv, fields |
550 | -import decimal_precision as dp |
551 | +from openerp.addons.decimal_precision import decimal_precision as dp |
552 | |
553 | |
554 | class mrp_production(osv.Model): |
555 | |
556 | === modified file 'mrp_pt_planified/mrp.py' |
557 | --- mrp_pt_planified/mrp.py 2014-05-09 21:51:34 +0000 |
558 | +++ mrp_pt_planified/mrp.py 2014-10-03 04:38:05 +0000 |
559 | @@ -26,7 +26,7 @@ |
560 | from openerp.osv import osv, fields |
561 | from openerp.tools.translate import _ |
562 | |
563 | -import decimal_precision as dp |
564 | +from openerp.addons.decimal_precision import decimal_precision as dp |
565 | |
566 | |
567 | class mrp_production(osv.Model): |
568 | |
569 | === modified file 'mrp_request_return/wizard/mrp_request_return.py' |
570 | --- mrp_request_return/wizard/mrp_request_return.py 2014-09-29 18:26:50 +0000 |
571 | +++ mrp_request_return/wizard/mrp_request_return.py 2014-10-03 04:38:05 +0000 |
572 | @@ -24,7 +24,7 @@ |
573 | # |
574 | ############################################################################## |
575 | from openerp.osv import osv, fields |
576 | -import decimal_precision as dp |
577 | +from openerp.addons.decimal_precision import decimal_precision as dp |
578 | |
579 | |
580 | class mrp_request_return(osv.TransientModel): |
581 | |
582 | === modified file 'mrp_subproduction/mrp.py' |
583 | --- mrp_subproduction/mrp.py 2014-09-29 18:26:50 +0000 |
584 | +++ mrp_subproduction/mrp.py 2014-10-03 04:38:05 +0000 |
585 | @@ -26,7 +26,7 @@ |
586 | |
587 | |
588 | from openerp.osv import osv, fields |
589 | -import decimal_precision as dp |
590 | +from openerp.addons.decimal_precision import decimal_precision as dp |
591 | |
592 | |
593 | class mrp_production(osv.Model): |
594 | |
595 | === modified file 'mrp_variation/mrp_variation.py' |
596 | --- mrp_variation/mrp_variation.py 2014-05-09 21:51:34 +0000 |
597 | +++ mrp_variation/mrp_variation.py 2014-10-03 04:38:05 +0000 |
598 | @@ -24,7 +24,7 @@ |
599 | # |
600 | ############################################################################## |
601 | from openerp.osv import osv, fields |
602 | -import decimal_precision as dp |
603 | +from openerp.addons.decimal_precision import decimal_precision as dp |
604 | |
605 | |
606 | class mrp_production(osv.Model): |
607 | |
608 | === modified file 'mrp_webkit_report_wizard/report/report_webkit_html.py' |
609 | --- mrp_webkit_report_wizard/report/report_webkit_html.py 2014-05-09 21:51:34 +0000 |
610 | +++ mrp_webkit_report_wizard/report/report_webkit_html.py 2014-10-03 04:38:05 +0000 |
611 | @@ -1,7 +1,7 @@ |
612 | import time |
613 | import os |
614 | import platform |
615 | -from report import report_sxw |
616 | +from openerp.report import report_sxw |
617 | |
618 | |
619 | class report_webkit_html(report_sxw.rml_parse): |
620 | |
621 | === modified file 'mrp_webkit_report_wizard/report/report_webkit_variation_group.py' |
622 | --- mrp_webkit_report_wizard/report/report_webkit_variation_group.py 2014-05-09 21:51:34 +0000 |
623 | +++ mrp_webkit_report_wizard/report/report_webkit_variation_group.py 2014-10-03 04:38:05 +0000 |
624 | @@ -1,7 +1,7 @@ |
625 | import time |
626 | import os |
627 | import platform |
628 | -from report import report_sxw |
629 | +from openerp.report import report_sxw |
630 | |
631 | |
632 | class report_webkit_variation_group(report_sxw.rml_parse): |
633 | |
634 | === modified file 'openacademy/openacademy.py' |
635 | --- openacademy/openacademy.py 2014-05-09 21:51:34 +0000 |
636 | +++ openacademy/openacademy.py 2014-10-03 04:38:05 +0000 |
637 | @@ -1,7 +1,7 @@ |
638 | # -*- encoding: utf-8 -*- |
639 | -from osv import osv |
640 | -from osv import fields |
641 | -from tools.translate import _ |
642 | +from openerp.osv import osv |
643 | +from openerp.osv import fields |
644 | +from openerp.tools.translate import _ |
645 | import time |
646 | |
647 | class Course(osv.osv): |
648 | |
649 | === modified file 'openacademy/partner.py' |
650 | --- openacademy/partner.py 2014-09-29 18:26:50 +0000 |
651 | +++ openacademy/partner.py 2014-10-03 04:38:05 +0000 |
652 | @@ -1,6 +1,6 @@ |
653 | # -*- encoding: utf-8 -*- |
654 | -from osv import osv |
655 | -from osv import fields |
656 | +from openerp.osv import osv |
657 | +from openerp.osv import fields |
658 | |
659 | class res_partner(osv.osv): |
660 | """ |
661 | |
662 | === modified file 'openacademy/report/openacademy_course.py' |
663 | --- openacademy/report/openacademy_course.py 2014-09-29 18:26:50 +0000 |
664 | +++ openacademy/report/openacademy_course.py 2014-10-03 04:38:05 +0000 |
665 | @@ -1,6 +1,6 @@ |
666 | # -*- encoding: utf-8 -*- |
667 | import time |
668 | -from report import report_sxw |
669 | +from openerp.report import report_sxw |
670 | |
671 | class openacademy_course(report_sxw.rml_parse): |
672 | """ |
673 | |
674 | === modified file 'openacademy/wizard/create_attendee_wizard.py' |
675 | --- openacademy/wizard/create_attendee_wizard.py 2014-09-29 18:26:50 +0000 |
676 | +++ openacademy/wizard/create_attendee_wizard.py 2014-10-03 04:38:05 +0000 |
677 | @@ -20,8 +20,8 @@ |
678 | # |
679 | ############################################################################## |
680 | |
681 | -from osv import osv |
682 | -from osv import fields |
683 | +from openerp.osv import osv |
684 | +from openerp.osv import fields |
685 | |
686 | class attendee_memory(osv.osv_memory): |
687 | """ |
688 | |
689 | === modified file 'openerp_print/report_sxw.py' |
690 | --- openerp_print/report_sxw.py 2014-09-29 18:26:50 +0000 |
691 | +++ openerp_print/report_sxw.py 2014-10-03 04:38:05 +0000 |
692 | @@ -24,7 +24,7 @@ |
693 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
694 | ############################################################################## |
695 | import report |
696 | -from report import report_sxw |
697 | +from openerp.report import report_sxw |
698 | from report.report_sxw import * |
699 | from report.report_sxw import rml_parse |
700 | import pooler |
701 | |
702 | === modified file 'openerp_print/report_sxw_ext.py' |
703 | --- openerp_print/report_sxw_ext.py 2014-09-29 18:26:50 +0000 |
704 | +++ openerp_print/report_sxw_ext.py 2014-10-03 04:38:05 +0000 |
705 | @@ -24,7 +24,7 @@ |
706 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
707 | ############################################################################## |
708 | |
709 | -from report import report_sxw |
710 | +from openerp.report import report_sxw |
711 | import pooler |
712 | from lxml import etree |
713 | import subprocess |
714 | |
715 | === modified file 'partner_effective_sale/model/partner.py' |
716 | --- partner_effective_sale/model/partner.py 2014-09-29 18:26:50 +0000 |
717 | +++ partner_effective_sale/model/partner.py 2014-10-03 04:38:05 +0000 |
718 | @@ -22,7 +22,7 @@ |
719 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
720 | ################################################################################ |
721 | |
722 | -from osv import fields, osv |
723 | +from openerp.osv import fields, osv |
724 | |
725 | class Partner(osv.osv): |
726 | _inherit = 'res.partner' |
727 | |
728 | === modified file 'picking_verification_report/report/picking.py' |
729 | --- picking_verification_report/report/picking.py 2014-09-29 18:26:50 +0000 |
730 | +++ picking_verification_report/report/picking.py 2014-10-03 04:38:05 +0000 |
731 | @@ -20,7 +20,7 @@ |
732 | ############################################################################## |
733 | |
734 | import time |
735 | -from report import report_sxw |
736 | +from openerp.report import report_sxw |
737 | |
738 | |
739 | class packing_list_report(report_sxw.rml_parse): |
740 | |
741 | === modified file 'product_historical_price/product.py' |
742 | --- product_historical_price/product.py 2014-09-29 18:26:50 +0000 |
743 | +++ product_historical_price/product.py 2014-10-03 04:38:05 +0000 |
744 | @@ -24,7 +24,7 @@ |
745 | ########################################################################## |
746 | from openerp.osv import fields, osv |
747 | |
748 | -import decimal_precision as dp |
749 | +from openerp.addons.decimal_precision import decimal_precision as dp |
750 | import time |
751 | |
752 | |
753 | |
754 | === modified file 'project_issue_fix_progress/project.py' |
755 | --- project_issue_fix_progress/project.py 2014-09-29 18:26:50 +0000 |
756 | +++ project_issue_fix_progress/project.py 2014-10-03 04:38:05 +0000 |
757 | @@ -21,7 +21,7 @@ |
758 | # You should have received a copy of the GNU Affero General Public License |
759 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
760 | ########################################################################## |
761 | -from osv import osv |
762 | +from openerp.osv import osv |
763 | |
764 | |
765 | class project_task(osv.osv): |
766 | |
767 | === modified file 'project_issue_report/report/project_issue_report.py' |
768 | --- project_issue_report/report/project_issue_report.py 2014-09-29 18:26:50 +0000 |
769 | +++ project_issue_report/report/project_issue_report.py 2014-10-03 04:38:05 +0000 |
770 | @@ -24,7 +24,7 @@ |
771 | ############################################################################## |
772 | |
773 | |
774 | -from report import report_sxw |
775 | +from openerp.report import report_sxw |
776 | import pooler |
777 | |
778 | |
779 | |
780 | === modified file 'project_issue_report2/report/project_issue.py' |
781 | --- project_issue_report2/report/project_issue.py 2014-09-30 14:38:46 +0000 |
782 | +++ project_issue_report2/report/project_issue.py 2014-10-03 04:38:05 +0000 |
783 | @@ -24,7 +24,7 @@ |
784 | ############################################################################ |
785 | import time |
786 | import pooler |
787 | -from report import report_sxw |
788 | +from openerp.report import report_sxw |
789 | |
790 | |
791 | |
792 | |
793 | === modified file 'project_task_work/report/parser.py' |
794 | --- project_task_work/report/parser.py 2014-09-29 18:26:50 +0000 |
795 | +++ project_task_work/report/parser.py 2014-10-03 04:38:05 +0000 |
796 | @@ -25,7 +25,7 @@ |
797 | |
798 | |
799 | import time |
800 | -from report import report_sxw |
801 | +from openerp.report import report_sxw |
802 | |
803 | |
804 | class project_task_work_report(report_sxw.rml_parse): |
805 | |
806 | === modified file 'psm/report/picking.py' |
807 | --- psm/report/picking.py 2014-05-09 21:51:34 +0000 |
808 | +++ psm/report/picking.py 2014-10-03 04:38:05 +0000 |
809 | @@ -20,7 +20,7 @@ |
810 | ############################################################################## |
811 | |
812 | import time |
813 | -from report import report_sxw |
814 | +from openerp.report import report_sxw |
815 | import pooler |
816 | |
817 | |
818 | |
819 | === modified file 'psm/wizard/pedigree_serialization_manager.py' |
820 | --- psm/wizard/pedigree_serialization_manager.py 2014-05-09 21:51:34 +0000 |
821 | +++ psm/wizard/pedigree_serialization_manager.py 2014-10-03 04:38:05 +0000 |
822 | @@ -22,7 +22,7 @@ |
823 | from openerp.osv import osv, fields |
824 | from openerp.tools.translate import _ |
825 | |
826 | -import decimal_precision as dp |
827 | +from openerp.addons.decimal_precision import decimal_precision as dp |
828 | |
829 | |
830 | class pedigree_serialization_manager(osv.TransientModel): |
831 | |
832 | === modified file 'report_move_voucher/report/account.py' |
833 | --- report_move_voucher/report/account.py 2014-05-09 21:51:34 +0000 |
834 | +++ report_move_voucher/report/account.py 2014-10-03 04:38:05 +0000 |
835 | @@ -25,7 +25,7 @@ |
836 | ############################################################################## |
837 | |
838 | import time |
839 | -from report import report_sxw |
840 | +from openerp.report import report_sxw |
841 | |
842 | |
843 | class move_voucher_report(report_sxw.rml_parse): |
844 | |
845 | === modified file 'report_process_production/report/process_production_report.py' |
846 | --- report_process_production/report/process_production_report.py 2014-09-29 18:26:50 +0000 |
847 | +++ report_process_production/report/process_production_report.py 2014-10-03 04:38:05 +0000 |
848 | @@ -20,7 +20,7 @@ |
849 | ############################################################################## |
850 | |
851 | import time |
852 | -from report import report_sxw |
853 | +from openerp.report import report_sxw |
854 | import pooler |
855 | |
856 | |
857 | |
858 | === modified file 'report_profit/invoice.py' |
859 | --- report_profit/invoice.py 2014-05-09 21:51:34 +0000 |
860 | +++ report_profit/invoice.py 2014-10-03 04:38:05 +0000 |
861 | @@ -25,7 +25,7 @@ |
862 | |
863 | import time |
864 | from openerp.osv import osv, fields |
865 | -import decimal_precision as dp |
866 | +from openerp.addons.decimal_precision import decimal_precision as dp |
867 | from operator import itemgetter |
868 | |
869 | |
870 | |
871 | === modified file 'report_profit/product.py' |
872 | --- report_profit/product.py 2014-05-09 21:51:34 +0000 |
873 | +++ report_profit/product.py 2014-10-03 04:38:05 +0000 |
874 | @@ -31,7 +31,7 @@ |
875 | |
876 | from openerp.osv import fields, osv |
877 | import time |
878 | -import decimal_precision as dp |
879 | +from openerp.addons.decimal_precision import decimal_precision as dp |
880 | |
881 | |
882 | class product_supplierinfo(osv.Model): |
883 | |
884 | === modified file 'report_profit/report/trial_cost.py' |
885 | --- report_profit/report/trial_cost.py 2014-09-30 14:38:46 +0000 |
886 | +++ report_profit/report/trial_cost.py 2014-10-03 04:38:05 +0000 |
887 | @@ -33,7 +33,7 @@ |
888 | ''' |
889 | |
890 | import time |
891 | -from report import report_sxw |
892 | +from openerp.report import report_sxw |
893 | import pooler |
894 | |
895 | |
896 | |
897 | === modified file 'sale_commission/sale_commission.py' |
898 | --- sale_commission/sale_commission.py 2014-09-30 14:38:46 +0000 |
899 | +++ sale_commission/sale_commission.py 2014-10-03 04:38:05 +0000 |
900 | @@ -2,7 +2,7 @@ |
901 | from openerp.osv import fields, osv |
902 | from openerp.tools.translate import _ |
903 | |
904 | -import decimal_precision as dp |
905 | +from openerp.addons.decimal_precision import decimal_precision as dp |
906 | |
907 | |
908 | class sale_commission(osv.Model): |
909 | |
910 | === modified file 'sale_uncommitted_product/model/product.py' |
911 | --- sale_uncommitted_product/model/product.py 2014-09-29 18:26:50 +0000 |
912 | +++ sale_uncommitted_product/model/product.py 2014-10-03 04:38:05 +0000 |
913 | @@ -26,7 +26,7 @@ |
914 | |
915 | from openerp.osv import osv, fields |
916 | |
917 | -import decimal_precision as dp |
918 | +from openerp.addons.decimal_precision import decimal_precision as dp |
919 | |
920 | |
921 | class product_product(osv.Model): |
922 | |
923 | === modified file 'stock_card/report_profit_picking.py' |
924 | --- stock_card/report_profit_picking.py 2014-09-30 14:38:46 +0000 |
925 | +++ stock_card/report_profit_picking.py 2014-10-03 04:38:05 +0000 |
926 | @@ -34,7 +34,7 @@ |
927 | import time |
928 | import datetime |
929 | from mx.DateTime import * |
930 | -import decimal_precision as dp |
931 | +from openerp.addons.decimal_precision import decimal_precision as dp |
932 | |
933 | |
934 | class report_profit_picking(osv.Model): |
935 | |
936 | === modified file 'stock_card/stock_card.py' |
937 | --- stock_card/stock_card.py 2014-09-30 14:38:46 +0000 |
938 | +++ stock_card/stock_card.py 2014-10-03 04:38:05 +0000 |
939 | @@ -35,7 +35,7 @@ |
940 | import time |
941 | import datetime |
942 | from mx.DateTime import * |
943 | -import decimal_precision as dp |
944 | +from openerp.addons.decimal_precision import decimal_precision as dp |
945 | |
946 | |
947 | class stock_card(osv.Model): |
948 | |
949 | === modified file 'stock_kardex/kardex.py' |
950 | --- stock_kardex/kardex.py 2014-09-29 18:26:50 +0000 |
951 | +++ stock_kardex/kardex.py 2014-10-03 04:38:05 +0000 |
952 | @@ -22,7 +22,7 @@ |
953 | ################################################################################ |
954 | |
955 | from openerp.osv import osv, fields |
956 | -import decimal_precision as dp |
957 | +from openerp.addons.decimal_precision import decimal_precision as dp |
958 | |
959 | from datetime import datetime |
960 | from dateutil.relativedelta import relativedelta |
961 | |
962 | === modified file 'user_story/report/user_story_report_mako.py' |
963 | --- user_story/report/user_story_report_mako.py 2014-09-29 18:26:50 +0000 |
964 | +++ user_story/report/user_story_report_mako.py 2014-10-03 04:38:05 +0000 |
965 | @@ -24,8 +24,8 @@ |
966 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
967 | # |
968 | |
969 | -from report_webkit import webkit_report |
970 | -from report import report_sxw |
971 | +from openerp.addons.report_webkit import webkit_report |
972 | +from openerp.report import report_sxw |
973 | from lxml import html |
974 | |
975 | class user_story_report(report_sxw.rml_parse): |
It looks and quite pythonic this way