Skip to content

Commit

Permalink
Merge pull request #49 from doronz88/feature/python3.8-support
Browse files Browse the repository at this point in the history
restore python3.8 support
  • Loading branch information
doronz88 authored Sep 9, 2024
2 parents f1afe66 + b49756b commit a450fa5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
python-version: [3.9, "3.10", 3.11, 3.12]
python-version: [3.8, 3.9, "3.10", 3.11, 3.12]

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 1 addition & 2 deletions fa/fainterp.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,7 @@ def get_alias(self):
"""
retval = {}

alias_res_path = os.path.join('commands', 'alias')
with importlib.resources.files('fa').joinpath(alias_res_path).open('rt') as f:
with open(os.path.join(COMMANDS_ROOT, 'alias')) as f:
for line in f.readlines():
line = line.strip()
k, v = line.split('=')
Expand Down
6 changes: 3 additions & 3 deletions fa/ida_plugin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import binascii
import importlib.resources
import os
import re
import subprocess
Expand Down Expand Up @@ -537,8 +536,9 @@ def update(self, ctx):

act_icon = -1
if action.icon_filename:
icon_data = \
importlib.resources.files('fa').joinpath(f'res/icons/{action.icon_filename}').read_bytes()
icon_full_filename = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'res', 'icons', action.icon_filename)
with open(icon_full_filename, 'rb') as f:
icon_data = f.read()
act_icon = ida_kernwin.load_custom_icon(data=icon_data, format="png")

act_name = action.name
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "fa"
description = "Automation tool for locating symbols & structs in binary (primarily IDA focused)"
readme = "README.md"
requires-python = ">=3.9"
requires-python = ">=3.8"
license = { text = "GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007" }
keywords = ["reverse-engineering", "ida", "automation", "signatures", "symbols"]
authors = [
Expand All @@ -15,6 +15,7 @@ classifiers = [
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down

0 comments on commit a450fa5

Please sign in to comment.