Skip to content

Commit 6988e77

Browse files
authored
fix: NoneType error on JSON output without position (#199)
1 parent cbc5f6a commit 6988e77

File tree

5 files changed

+38
-28
lines changed

5 files changed

+38
-28
lines changed

.scripts/tests-e2e.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ assertSuccess "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-0
9898
assertSuccess "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-01-27 --format=json"
9999
assertFailure "$KOSMORRO_COMMAND --latitude=50.5876 --longitude=3.0624 -d 2020-01-27 --format=pdf"
100100

101+
assertSuccess "$KOSMORRO_COMMAND -d 2020-01-27 --format=json"
102+
101103
# Environment variables
102104
assertSuccess "LATITUDE=50.5876 LONGITUDE=3.0624 TIMEZONE=1 kosmorro -d 2020-01-27"
103105
assertSuccess "LATITUDE=50.5876 LONGITUDE=3.0624 TIMEZONE=-1 kosmorro -d 2020-01-27"

_kosmorro/dumper.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,23 @@
4343

4444

4545
class Dumper(ABC):
46+
ephemerides: [AsterEphemerides]
47+
moon_phase: MoonPhase
48+
events: [Event]
49+
date: datetime.date
50+
timezone: int
51+
with_colors: bool
52+
show_graph: bool
53+
4654
def __init__(
4755
self,
48-
ephemerides: [AsterEphemerides] = None,
49-
moon_phase: MoonPhase = None,
50-
events: [Event] = None,
51-
date: datetime.date = datetime.date.today(),
52-
timezone: int = 0,
53-
with_colors: bool = True,
54-
show_graph: bool = False,
56+
ephemerides: [AsterEphemerides],
57+
moon_phase: MoonPhase,
58+
events: [Event],
59+
date: datetime.date,
60+
timezone: int,
61+
with_colors: bool,
62+
show_graph: bool,
5563
):
5664
self.ephemerides = ephemerides
5765
self.moon_phase = moon_phase
@@ -99,7 +107,7 @@ class TextDumper(Dumper):
99107
def to_string(self):
100108
text = [self.style(self.get_date_as_string(capitalized=True), "h1")]
101109

102-
if self.ephemerides is not None:
110+
if len(self.ephemerides) > 0:
103111
text.append(self.stringify_ephemerides())
104112

105113
text.append(self.get_moon(self.moon_phase))

_kosmorro/locales/messages.pot

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: kosmorro 0.10.1\n"
1010
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
11-
"POT-Creation-Date: 2021-07-19 12:19+0200\n"
11+
"POT-Creation-Date: 2021-08-26 11:37+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,84 +27,84 @@ msgid ""
2727
"offset format."
2828
msgstr ""
2929

30-
#: _kosmorro/dumper.py:111
30+
#: _kosmorro/dumper.py:119
3131
msgid "Expected events:"
3232
msgstr ""
3333

34-
#: _kosmorro/dumper.py:118
34+
#: _kosmorro/dumper.py:126
3535
msgid "Note: All the hours are given in UTC."
3636
msgstr ""
3737

38-
#: _kosmorro/dumper.py:125
38+
#: _kosmorro/dumper.py:133
3939
msgid "Note: All the hours are given in the UTC{offset} timezone."
4040
msgstr ""
4141

42-
#: _kosmorro/dumper.py:193 _kosmorro/dumper.py:323
42+
#: _kosmorro/dumper.py:201 _kosmorro/dumper.py:331
4343
msgid "Object"
4444
msgstr ""
4545

46-
#: _kosmorro/dumper.py:194 _kosmorro/dumper.py:324
46+
#: _kosmorro/dumper.py:202 _kosmorro/dumper.py:332
4747
msgid "Rise time"
4848
msgstr ""
4949

50-
#: _kosmorro/dumper.py:195 _kosmorro/dumper.py:326
50+
#: _kosmorro/dumper.py:203 _kosmorro/dumper.py:334
5151
msgid "Culmination time"
5252
msgstr ""
5353

54-
#: _kosmorro/dumper.py:196 _kosmorro/dumper.py:328
54+
#: _kosmorro/dumper.py:204 _kosmorro/dumper.py:336
5555
msgid "Set time"
5656
msgstr ""
5757

58-
#: _kosmorro/dumper.py:224
58+
#: _kosmorro/dumper.py:232
5959
msgid "Moon phase is unavailable for this date."
6060
msgstr ""
6161

62-
#: _kosmorro/dumper.py:228 _kosmorro/dumper.py:332
62+
#: _kosmorro/dumper.py:236 _kosmorro/dumper.py:340
6363
msgid "Moon phase:"
6464
msgstr ""
6565

66-
#: _kosmorro/dumper.py:232
66+
#: _kosmorro/dumper.py:240
6767
msgid "{next_moon_phase} on {next_moon_phase_date} at {next_moon_phase_time}"
6868
msgstr ""
6969

70-
#: _kosmorro/dumper.py:296
70+
#: _kosmorro/dumper.py:304
7171
msgid "Overview of your sky"
7272
msgstr ""
7373

74-
#: _kosmorro/dumper.py:304
74+
#: _kosmorro/dumper.py:312
7575
msgid ""
7676
"This document summarizes the ephemerides and the events of {date}. It "
7777
"aims to help you to prepare your observation session. All the hours are "
7878
"given in {timezone}."
7979
msgstr ""
8080

81-
#: _kosmorro/dumper.py:314
81+
#: _kosmorro/dumper.py:322
8282
msgid ""
8383
"Don't forget to check the weather forecast before you go out with your "
8484
"equipment."
8585
msgstr ""
8686

87-
#: _kosmorro/dumper.py:321
87+
#: _kosmorro/dumper.py:329
8888
msgid "Ephemerides of the day"
8989
msgstr ""
9090

91-
#: _kosmorro/dumper.py:330
91+
#: _kosmorro/dumper.py:338
9292
msgid "hours"
9393
msgstr ""
9494

95-
#: _kosmorro/dumper.py:337
95+
#: _kosmorro/dumper.py:345
9696
msgid "Expected events"
9797
msgstr ""
9898

99-
#: _kosmorro/dumper.py:491
99+
#: _kosmorro/dumper.py:499
100100
msgid ""
101101
"Building PDF was not possible, because some dependencies are not "
102102
"installed.\n"
103103
"Please look at the documentation at https://kosmorro.space/cli/generate-"
104104
"pdf/ for more information."
105105
msgstr ""
106106

107-
#: _kosmorro/dumper.py:544
107+
#: _kosmorro/dumper.py:552
108108
#, python-format
109109
msgid ""
110110
"An error occurred during the compilation of the PDF.\n"

_kosmorro/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def get_information(
152152
except OutOfRangeDateError as error:
153153
raise DateRangeError(error.min_date, error.max_date)
154154
else:
155-
eph = None
155+
eph = []
156156

157157
try:
158158
moon_phase = get_moon_phase(compute_date)

test/events.py

Whitespace-only changes.

0 commit comments

Comments
 (0)