Skip to content

Commit

Permalink
[FIX] Various P3-related import changes
Browse files Browse the repository at this point in the history
* LDAP import: python-ldap is not python3-compatible, pyldap is

  Warning: only supported from debian Stretch (current testing)?
  https://packages.debian.org/search?searchon=names&keywords=pyldap

* implicitly relative imports
* imports of moved or removed stdlib modules

issue odoo#8530
  • Loading branch information
xmo-odoo authored Apr 28, 2017
1 parent c5579ef commit b4429c2
Show file tree
Hide file tree
Showing 633 changed files with 1,509 additions and 1,583 deletions.
6 changes: 3 additions & 3 deletions addons/account/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models

import wizard
import report
from . import wizard
from . import report

from odoo import api, SUPERUSER_ID

Expand Down
26 changes: 13 additions & 13 deletions addons/account/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# -*- coding: utf-8 -*-

import partner
import account
import account_payment
import account_invoice
import account_bank_statement
import account_move
import chart_template
import account_analytic_line
import account_journal_dashboard
import product
import company
import res_config
import web_planner
from . import partner
from . import account
from . import account_payment
from . import account_invoice
from . import account_bank_statement
from . import account_move
from . import chart_template
from . import account_analytic_line
from . import account_journal_dashboard
from . import product
from . import company
from . import res_config
from . import web_planner
18 changes: 9 additions & 9 deletions addons/account/report/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_financial_report
import account_invoice_report
import account_overdue_report
import account_general_ledger
import account_balance
import account_report_financial
import account_aged_partner_balance
import account_partner_ledger
import account_journal
from . import account_financial_report
from . import account_invoice_report
from . import account_overdue_report
from . import account_general_ledger
from . import account_balance
from . import account_report_financial
from . import account_aged_partner_balance
from . import account_partner_ledger
from . import account_journal
36 changes: 18 additions & 18 deletions addons/account/wizard/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.


import account_reconcile
import account_unreconcile
import account_invoice_refund
import account_invoice_state
import account_validate_account_move
import pos_box
import account_move_reversal
import account_report_common
import account_report_common_account
import account_report_common_partner
import account_report_common_journal
import account_report_print_journal
import account_report_general_ledger
import account_report_partner_ledger
import account_report_trial_balance
import account_financial_report
import account_report_aged_partner_balance
import wizard_tax_adjustments
from . import account_reconcile
from . import account_unreconcile
from . import account_invoice_refund
from . import account_invoice_state
from . import account_validate_account_move
from . import pos_box
from . import account_move_reversal
from . import account_report_common
from . import account_report_common_account
from . import account_report_common_partner
from . import account_report_common_journal
from . import account_report_print_journal
from . import account_report_general_ledger
from . import account_report_partner_ledger
from . import account_report_trial_balance
from . import account_financial_report
from . import account_report_aged_partner_balance
from . import wizard_tax_adjustments
2 changes: 1 addition & 1 deletion addons/account_accountant/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
2 changes: 1 addition & 1 deletion addons/account_accountant/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import res_config
from . import res_config
2 changes: 1 addition & 1 deletion addons/account_analytic_default/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
6 changes: 3 additions & 3 deletions addons/account_analytic_default/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_analytic_default
import sale_order_line
import product
from . import account_analytic_default
from . import sale_order_line
from . import product
6 changes: 3 additions & 3 deletions addons/account_asset/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
import wizard
import report
from . import models
from . import wizard
from . import report
8 changes: 4 additions & 4 deletions addons/account_asset/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account
import account_asset
import account_invoice
import product
from . import account
from . import account_asset
from . import account_invoice
from . import product
2 changes: 1 addition & 1 deletion addons/account_asset/report/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_asset_report
from . import account_asset_report
4 changes: 2 additions & 2 deletions addons/account_asset/wizard/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import asset_depreciation_confirmation_wizard
import asset_modify
from . import asset_depreciation_confirmation_wizard
from . import asset_modify
6 changes: 3 additions & 3 deletions addons/account_bank_statement_import/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-

import account_bank_statement_import
import account_journal
from . import account_bank_statement_import
from . import account_journal

import wizard
from . import wizard
2 changes: 1 addition & 1 deletion addons/account_bank_statement_import/wizard/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import journal_creation
from . import journal_creation
2 changes: 1 addition & 1 deletion addons/account_budget/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
4 changes: 2 additions & 2 deletions addons/account_budget/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_budget
import account_analytic_account
from . import account_budget
from . import account_analytic_account
6 changes: 3 additions & 3 deletions addons/account_budget/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import common
import test_theoreticalamount
import test_account_budget
from . import common
from . import test_theoreticalamount
from . import test_account_budget
2 changes: 1 addition & 1 deletion addons/account_cancel/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
2 changes: 1 addition & 1 deletion addons/account_cancel/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_bank_statement
from . import account_bank_statement
4 changes: 2 additions & 2 deletions addons/account_check_printing/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
import wizard
from . import models
from . import wizard
4 changes: 2 additions & 2 deletions addons/account_check_printing/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_journal
import account_payment
from . import account_journal
from . import account_payment
2 changes: 1 addition & 1 deletion addons/account_check_printing/wizard/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import print_prenumbered_checks
from . import print_prenumbered_checks
2 changes: 1 addition & 1 deletion addons/account_tax_python/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
2 changes: 1 addition & 1 deletion addons/account_tax_python/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_tax
from . import account_tax
4 changes: 2 additions & 2 deletions addons/account_test/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
import report
from . import models
from . import report
2 changes: 1 addition & 1 deletion addons/account_test/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import accounting_assert_test
from . import accounting_assert_test
2 changes: 1 addition & 1 deletion addons/account_test/report/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import report_account_test
from . import report_account_test
2 changes: 1 addition & 1 deletion addons/account_voucher/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
2 changes: 1 addition & 1 deletion addons/account_voucher/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import account_voucher
from . import account_voucher
2 changes: 1 addition & 1 deletion addons/analytic/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
2 changes: 1 addition & 1 deletion addons/analytic/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import analytic_account
from . import analytic_account
4 changes: 2 additions & 2 deletions addons/anonymization/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
import wizard
from . import models
from . import wizard
2 changes: 1 addition & 1 deletion addons/anonymization/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import anonymization
from . import anonymization
2 changes: 1 addition & 1 deletion addons/anonymization/wizard/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import anonymize_wizard
from . import anonymize_wizard
2 changes: 1 addition & 1 deletion addons/auth_crypt/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import models
from . import models
2 changes: 1 addition & 1 deletion addons/auth_crypt/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

import res_users
from . import res_users
2 changes: 1 addition & 1 deletion addons/auth_ldap/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import models
from . import models
8 changes: 4 additions & 4 deletions addons/auth_ldap/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import res_company
import res_company_ldap
import res_users
import auth_ldap_config_settings
from . import res_company
from . import res_company_ldap
from . import res_users
from . import auth_ldap_config_settings
4 changes: 2 additions & 2 deletions addons/auth_oauth/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import controllers
import models
from . import controllers
from . import models
2 changes: 1 addition & 1 deletion addons/auth_oauth/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import main
from . import main
8 changes: 4 additions & 4 deletions addons/auth_oauth/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import auth_oauth
import ir_config_parameter
import res_config
import res_users
from . import auth_oauth
from . import ir_config_parameter
from . import res_config
from . import res_users
4 changes: 2 additions & 2 deletions addons/auth_signup/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

import controllers
import models
from . import controllers
from . import models
2 changes: 1 addition & 1 deletion addons/auth_signup/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

import main
from . import main
6 changes: 3 additions & 3 deletions addons/auth_signup/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-

import res_config
import res_users
import res_partner
from . import res_config
from . import res_users
from . import res_partner
2 changes: 1 addition & 1 deletion addons/barcodes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

import models
from . import models
Loading

0 comments on commit b4429c2

Please sign in to comment.