Skip to content

Commit 29e6b9f

Browse files
committed
[FIX] coding_guidelines: Add comment to indicate ASCII-based ordering
Following the fix - 92c7099 Adding a comment to explicitly indicate that the import is ordered alphabetically based on ASCII values. X-original-commit: a9577b5
1 parent df1b3e9 commit 29e6b9f

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

content/contributing/development/coding_guidelines.rst

+8
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,16 @@ Inside these 3 groups, the imported lines are alphabetically sorted.
424424
import time
425425
from datetime import datetime
426426
# 2 : imports of odoo
427+
<<<<<<< df1b3e92e95ca7dbf4fac56999132bd9f6a0949a
427428
from odoo import Command, _, api, fields, models # alphabetically ordered
428429
from odoo.fields import Domain
430+
||||||| 89c4692a47e37ea78842fe26f0222b7b93c9f2d7
431+
import odoo
432+
from odoo import Command, _, api, fields, models # alphabetically ordered
433+
=======
434+
import odoo
435+
from odoo import Command, _, api, fields, models # ASCIIbetically ordered
436+
>>>>>>> 38e39a41114981ad8f7f719cdd7cf0df1ec9b783
429437
from odoo.tools.safe_eval import safe_eval as eval
430438
# 3 : imports from odoo addons
431439
from odoo.addons.web.controllers.main import login_redirect

0 commit comments

Comments
 (0)