Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
olb
hreports
Commits
98e8b84c
Commit
98e8b84c
authored
Mar 10, 2018
by
Philippe
Committed by
olb
Aug 25, 2019
Browse files
python3: from iteritems to items
parent
f59eaa19
Changes
1
Hide whitespace changes
Inline
Side-by-side
hreports/settings.py
View file @
98e8b84c
...
...
@@ -111,7 +111,7 @@ for report_type in __settings['REPORTS_DEFAULT'].keys():
if
report_type
in
__reports_default
:
import
collections
def
update
(
d
,
u
):
for
k
,
v
in
u
.
iter
items
():
for
k
,
v
in
u
.
items
():
if
isinstance
(
v
,
collections
.
Mapping
):
r
=
update
(
d
.
get
(
k
,
{}),
v
)
d
[
k
]
=
r
...
...
@@ -126,7 +126,7 @@ for report_type in __settings['REPORTS_DEFAULT'].keys():
__settings
[
'REPORTS'
]
=
[]
for
year
in
__accounting_years
:
for
report_type
,
report_default
in
__settings
[
'REPORTS_DEFAULT'
].
iter
items
():
for
report_type
,
report_default
in
__settings
[
'REPORTS_DEFAULT'
].
items
():
__report
=
report_default
.
copy
()
__report
[
'year'
]
=
year
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment