Skip to content

Remove deprecated iteritems #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
axelstudios wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove deprecated iteritems #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions buildingid/command_line/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,15 @@ def sort_order_to_ascending_(value: str) -> typing.Optional[bool]:
left_series_codeArea.progress_apply(lambda codeArea: codeArea.longitudeHi).max(),
left_series_codeArea.progress_apply(lambda codeArea: codeArea.latitudeHi).max(),
])
for left_index, left_codeArea in tqdm(left_series_codeArea.iteritems(), total=len(left_series_codeArea)):
for left_index, left_codeArea in tqdm(left_series_codeArea.items(), total=len(left_series_codeArea)):
if left_codeArea is not None:
left_spindex.insert(item=(left_index, left_codeArea), bbox=[left_codeArea.longitudeLo, left_codeArea.latitudeLo, left_codeArea.longitudeHi, left_codeArea.latitudeHi])

logger.info('[crossref] Cross-referencing rows of right input file against quadtree for left input file')
dst_data: typing.List[typing.Tuple[int, int, CodeArea, CodeArea]] = [
(left_index, right_index, left_codeArea, right_codeArea)
for right_index, right_codeArea
in tqdm(right_series_codeArea.iteritems(), total=len(right_series_codeArea))
in tqdm(right_series_codeArea.items(), total=len(right_series_codeArea))
if right_codeArea is not None
for (left_index, left_codeArea)
in left_spindex.intersect([right_codeArea.longitudeLo, right_codeArea.latitudeLo, right_codeArea.longitudeHi, right_codeArea.latitudeHi])
Expand All @@ -323,15 +323,15 @@ def sort_order_to_ascending_(value: str) -> typing.Optional[bool]:
right_series_codeArea.progress_apply(lambda codeArea: codeArea.longitudeHi).max(),
right_series_codeArea.progress_apply(lambda codeArea: codeArea.latitudeHi).max(),
])
for right_index, right_codeArea in tqdm(right_series_codeArea.iteritems(), total=len(right_series_codeArea)):
for right_index, right_codeArea in tqdm(right_series_codeArea.items(), total=len(right_series_codeArea)):
if right_codeArea is not None:
right_spindex.insert(item=(right_index, right_codeArea), bbox=[right_codeArea.longitudeLo, right_codeArea.latitudeLo, right_codeArea.longitudeHi, right_codeArea.latitudeHi])

logger.info('[crossref] Cross-referencing rows of left input file against quadtree for right input file')
dst_data: typing.List[typing.Tuple[int, int, CodeArea, CodeArea]] = [
(left_index, right_index, left_codeArea, right_codeArea)
for left_index, left_codeArea
in tqdm(left_series_codeArea.iteritems(), total=len(left_series_codeArea))
in tqdm(left_series_codeArea.items(), total=len(left_series_codeArea))
if left_codeArea is not None
for (right_index, right_codeArea)
in right_spindex.intersect([left_codeArea.longitudeLo, left_codeArea.latitudeLo, left_codeArea.longitudeHi, left_codeArea.latitudeHi])
Expand Down