From 997cf014c1485aa47c7758630f6427d6d6f90cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Deuchnord?= Date: Sat, 6 Jun 2020 16:47:06 +0200 Subject: [PATCH] refactor: remove dead code --- kosmorrolib/dumper.py | 32 +--------------------------- kosmorrolib/locales/messages.pot | 36 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/kosmorrolib/dumper.py b/kosmorrolib/dumper.py index 53d8701..9a81f17 100644 --- a/kosmorrolib/dumper.py +++ b/kosmorrolib/dumper.py @@ -22,9 +22,8 @@ import json import os from pathlib import Path from tabulate import tabulate -from numpy import int64 from termcolor import colored -from .data import ASTERS, Object, AsterEphemerides, MoonPhase, Event +from .data import ASTERS, AsterEphemerides, MoonPhase, Event from .i18n import _, FULL_DATE_FORMAT, SHORT_DATETIME_FORMAT, TIME_FORMAT from .version import VERSION from .exceptions import UnavailableFeatureError @@ -74,35 +73,6 @@ class JsonDumper(Dumper): 'events': [event.serialize() for event in self.events] }, indent=4) - @staticmethod - def _json_default(obj): - # Fixes the "TypeError: Object of type int64 is not JSON serializable" - # See https://stackoverflow.com/a/50577730 - if isinstance(obj, int64): - return int(obj) - if isinstance(obj, datetime.datetime): - return obj.isoformat() - if isinstance(obj, Object): - obj = obj.__dict__ - obj.pop('skyfield_name') - obj.pop('radius') - obj['object'] = obj.pop('name') - obj['details'] = obj.pop('ephemerides') - return obj - if isinstance(obj, AsterEphemerides): - return obj.__dict__ - if isinstance(obj, MoonPhase): - moon_phase = obj.__dict__ - moon_phase['phase'] = moon_phase.pop('identifier') - moon_phase['date'] = moon_phase.pop('time') - return moon_phase - if isinstance(obj, Event): - event = obj.__dict__ - event['objects'] = [object.name for object in event['objects']] - return event - - raise TypeError('Object of type "%s" could not be integrated in the JSON' % str(type(obj))) - class TextDumper(Dumper): def to_string(self): diff --git a/kosmorrolib/locales/messages.pot b/kosmorrolib/locales/messages.pot index 6d609db..f66a485 100644 --- a/kosmorrolib/locales/messages.pot +++ b/kosmorrolib/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kosmorro 0.8.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-06-06 16:43+0200\n" +"POT-Creation-Date: 2020-06-06 16:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -123,76 +123,76 @@ msgstr "" msgid "Pluto" msgstr "" -#: kosmorrolib/dumper.py:117 +#: kosmorrolib/dumper.py:87 msgid "Expected events:" msgstr "" -#: kosmorrolib/dumper.py:121 +#: kosmorrolib/dumper.py:91 msgid "Note: All the hours are given in UTC." msgstr "" -#: kosmorrolib/dumper.py:126 +#: kosmorrolib/dumper.py:96 msgid "Note: All the hours are given in the UTC{offset} timezone." msgstr "" -#: kosmorrolib/dumper.py:172 kosmorrolib/dumper.py:259 +#: kosmorrolib/dumper.py:142 kosmorrolib/dumper.py:229 msgid "Object" msgstr "" -#: kosmorrolib/dumper.py:173 kosmorrolib/dumper.py:260 +#: kosmorrolib/dumper.py:143 kosmorrolib/dumper.py:230 msgid "Rise time" msgstr "" -#: kosmorrolib/dumper.py:174 kosmorrolib/dumper.py:261 +#: kosmorrolib/dumper.py:144 kosmorrolib/dumper.py:231 msgid "Culmination time" msgstr "" -#: kosmorrolib/dumper.py:175 kosmorrolib/dumper.py:262 +#: kosmorrolib/dumper.py:145 kosmorrolib/dumper.py:232 msgid "Set time" msgstr "" -#: kosmorrolib/dumper.py:190 +#: kosmorrolib/dumper.py:160 msgid "Moon phase is unavailable for this date." msgstr "" -#: kosmorrolib/dumper.py:192 kosmorrolib/dumper.py:266 +#: kosmorrolib/dumper.py:162 kosmorrolib/dumper.py:236 msgid "Moon phase:" msgstr "" -#: kosmorrolib/dumper.py:193 +#: kosmorrolib/dumper.py:163 msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}" msgstr "" -#: kosmorrolib/dumper.py:246 +#: kosmorrolib/dumper.py:216 msgid "A Summary of your Sky" msgstr "" -#: kosmorrolib/dumper.py:250 +#: kosmorrolib/dumper.py:220 msgid "" "This document summarizes the ephemerides and the events of {date}. It " "aims to help you to prepare your observation session. All the hours are " "given in {timezone}." msgstr "" -#: kosmorrolib/dumper.py:256 +#: kosmorrolib/dumper.py:226 msgid "" "Don't forget to check the weather forecast before you go out with your " "equipment." msgstr "" -#: kosmorrolib/dumper.py:258 +#: kosmorrolib/dumper.py:228 msgid "Ephemerides of the day" msgstr "" -#: kosmorrolib/dumper.py:264 +#: kosmorrolib/dumper.py:234 msgid "hours" msgstr "" -#: kosmorrolib/dumper.py:268 +#: kosmorrolib/dumper.py:238 msgid "Expected events" msgstr "" -#: kosmorrolib/dumper.py:382 +#: kosmorrolib/dumper.py:352 msgid "" "Building PDFs was not possible, because some dependencies are not " "installed.\n"