From 9cd182ebdc5fef0e1f1cf3f08caea6d7c4b94a8f Mon Sep 17 00:00:00 2001 From: Taku Fukada Date: Sat, 9 Mar 2024 00:51:18 +0900 Subject: [PATCH] fix: lint SIM113 Use `enumerate()` --- .github/workflows/lint.yml | 4 ++-- plateau_plugin/plateau/parse/parser.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5dd68f3..86c9aae 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -42,8 +42,8 @@ jobs: # - name: pyright # run: poetry run pyright . - - name: ruff-format + - name: ruff (format) run: poetry run ruff format --check . - - name: ruff + - name: ruff (lint) run: poetry run ruff check --output-format github . diff --git a/plateau_plugin/plateau/parse/parser.py b/plateau_plugin/plateau/parse/parser.py index d2c77da..4c22281 100644 --- a/plateau_plugin/plateau/parse/parser.py +++ b/plateau_plugin/plateau/parse/parser.py @@ -372,12 +372,10 @@ def count_toplevel_cityobjs(self) -> int: def iter_cityobjs(self) -> Iterable[tuple[int, CityObject]]: """都市オブジェクトをパースして返す""" - toplevel_count = 0 - for city_object in self._doc.iterfind( - "./core:cityObjectMember/*", self._ns.nsmap + for toplevel_count, city_object in enumerate( + self._doc.iterfind("./core:cityObjectMember/*", self._ns.nsmap) ): for cityobj in self._parser.process_cityobj_element( city_object, parent=None ): yield (toplevel_count, cityobj) - toplevel_count += 1