Skip to content

Commit

Permalink
pep8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
hemna committed Nov 17, 2023
1 parent 638128a commit 6b397cb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 26 deletions.
25 changes: 3 additions & 22 deletions aprsd/packets/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,11 @@ def _init_msgNo(): # noqa: N802

def factory_from_dict(packet_dict):
pkt_type = get_packet_type(packet_dict)
# print(f"pkt_type {pkt_type}")
if pkt_type:
# if pkt_type == 'unknown':
# # try to determine it by the raw
# raw = packet_dict.get('raw')
# if raw:
# import aprslib
# type = get_packet_type(aprslib.parse(raw))
# print(f"raw type {type}")

cls = TYPE_LOOKUP[pkt_type]
# print(f"CLS {cls}")

return cls.from_dict(packet_dict)



def factory_from_json(packet_dict):
pkt_type = get_packet_type(packet_dict)
if pkt_type:
Expand All @@ -97,7 +85,7 @@ class Packet(metaclass=abc.ABCMeta):
# Fields related to sending packets out
send_count: int = field(repr=False, default=0, compare=False, hash=False)
retry_count: int = field(repr=False, default=3, compare=False, hash=False)
#last_send_time: datetime = field(
# last_send_time: datetime = field(
# metadata=dc_json_config(
# encoder=datetime.isoformat,
# decoder=datetime.fromisoformat,
Expand All @@ -106,7 +94,7 @@ class Packet(metaclass=abc.ABCMeta):
# default_factory=_init_send_time,
# compare=False,
# hash=False
#)
# )
last_send_time: float = field(repr=False, default=0, compare=False, hash=False)
last_send_attempt: int = field(repr=False, default=0, compare=False, hash=False)

Expand All @@ -123,7 +111,6 @@ def json(self):
"""
get the json formated string
"""
#return json.dumps(self.__dict__, cls=aprsd_json.EnhancedJSONEncoder)
return self.to_json()

def get(self, key, default=None):
Expand Down Expand Up @@ -330,6 +317,7 @@ def __post__init__(self):
def _build_payload(self):
self.payload = f":{self.to_call.ljust(9)} :rej{self.msgNo}"


@dataclass_json
@dataclass(unsafe_hash=True)
class MessagePacket(Packet):
Expand Down Expand Up @@ -478,13 +466,6 @@ def _build_raw(self):
)


@dataclass
class StatusPacket(Packet):
status: str = None
messagecapable: bool = False
comment: str = None


@dataclass
class MicEPacket(GPSPacket):
messagecapable: bool = False
Expand Down
1 change: 0 additions & 1 deletion aprsd/packets/packet_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ def _add(self, packet):
def copy(self):
return self.d.copy()


@property
def maxlen(self):
return self._maxlen
Expand Down
7 changes: 4 additions & 3 deletions aprsd/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ def plugins():

return "reloaded"


def _get_namespaces():
args = []

Expand All @@ -259,13 +260,13 @@ def generate_oslo():
generator.generate(CONF, string_out)
return string_out.getvalue()


@auth.login_required
@app.route("/oslo")
def oslo():
return generate_oslo()



@auth.login_required
@app.route("/save")
def save():
Expand Down Expand Up @@ -407,8 +408,8 @@ def init_app(config_file=None, log_level=None):

log_level = init_app(
log_level="DEBUG",
#config_file="/config/aprsd.conf",
config_file = cli_helper.DEFAULT_CONFIG_FILE,
# config_file="/config/aprsd.conf",
config_file=cli_helper.DEFAULT_CONFIG_FILE,
)
setup_logging(app, log_level)
sio.register_namespace(LoggingNamespace("/logs"))
Expand Down

0 comments on commit 6b397cb

Please sign in to comment.