Fixing PR issues from PR OmegaK2#37

Wires77 · Nov 6, 2021 · 59bcc8a · 59bcc8a
1 parent 4fcc59f
commit 59bcc8a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/PyPoE/cli/exporter/wiki/parsers/item.py b/PyPoE/cli/exporter/wiki/parsers/item.py
@@ -3323,7 +3323,7 @@ def _export(self, parsed_args, items):
 
     def _print_item_rowid(self, parsed_args, base_item_type):
         #Don't print anything if not running in the rowid mode.
-        if (not 'start' in vars(parsed_args).keys()) or (not 'end' in vars(parsed_args).keys()):
+        if not set(['start', 'end']).issubset(vars(parsed_args).keys()):
             return
 
         export_row_count = parsed_args.end - parsed_args.start
@@ -3335,7 +3335,7 @@ def _print_item_rowid(self, parsed_args, base_item_type):
 
         item_offset = base_item_type.rowid - parsed_args.start
         if (item_offset == 0) or item_offset % print_granularity == 0:
-            console('Processing item with rowid {}: {}'.format(base_item_type.rowid, base_item_type['Name']))
+            console(f"Processing item with rowid {base_item_type.rowid}: {base_item_type['Name']}")
         return
 
     def _format_map_name(self, base_item_type, map_series, language=None):

diff --git a/PyPoE/cli/exporter/wiki/parsers/passives.py b/PyPoE/cli/exporter/wiki/parsers/passives.py
@@ -293,7 +293,7 @@ def export(self, parsed_args, passives):
             #atlas_start_node doesn't have an icon path
             else:
                 data['icon'] = ''
-                warnings.warn('Icon path file not found for {}: {}'.format(passive['Id'], passive['Name']))
+                warnings.warn(f"Icon path file not found for {passive['Id']}: {passive['Name']}")
 
             data['icon'] = data['icon'].replace('.dds', '')
 

diff --git a/PyPoE/cli/exporter/wiki/parsers/skill.py b/PyPoE/cli/exporter/wiki/parsers/skill.py
@@ -742,7 +742,7 @@ def export(self, parsed_args, skills):
             if not parsed_args.allow_skill_gems and skill in \
                     self.rr['SkillGems.dat'].index['GrantedEffectsKey']:
                 console(
-                    'Skipping skill gem skill "{}" at row {}'.format(skill['Id'], skill.rowid),
+                    f"Skipping skill gem skill \"{skill['Id']}\" at row {skill.rowid}",
                     msg=Msg.warning)
                 continue
             data = OrderedDict()
@@ -751,7 +751,7 @@ def export(self, parsed_args, skills):
                 self._skill(ge=skill, infobox=data, parsed_args=parsed_args)
             except Exception as e:
                 console(
-                    'Error when parsing skill "{}" at {}:'.format(skill['Id'], skill.rowid),
+                    f"Error when parsing skill \"{skill['Id']}\" at {skill.rowid}:",
                     msg=Msg.error)
                 console(traceback.format_exc(), msg=Msg.error)