Skip to content

Commit eb56b0c

Browse files
Fix documentation and small things
1 parent 46f6107 commit eb56b0c

File tree

3 files changed

+49
-13
lines changed

3 files changed

+49
-13
lines changed

doc/source/globals.rst

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,6 @@ Application Paths
141141

142142
.. autodata:: APPLICATIONS
143143

144-
Other
145-
-----
146-
147-
:hide:`LANGUAGES`
148-
^^^^^^^^^^^^^^^^^
149-
150-
.. autodata:: LANGUAGES
151-
152144
Flags
153145
-----
154146

@@ -188,6 +180,34 @@ Flags
188180
.. autodata:: CONTENT
189181
:annotation: = int('0001', 2)
190182

183+
Other
184+
-----
185+
186+
:hide:`LANGUAGES`
187+
^^^^^^^^^^^^^^^^^
188+
189+
.. autodata:: LANGUAGES
190+
191+
:hide:`LIBRARIES`
192+
^^^^^^^^^^^^^^^^^
193+
194+
.. autodata:: LIBRARIES
195+
196+
:hide:`PLAY_MODES`
197+
^^^^^^^^^^^^^^^^^^
198+
199+
.. autodata:: PLAY_MODES
200+
201+
:hide:`STATUSES`
202+
^^^^^^^^^^^^^^^^
203+
204+
.. autodata:: STATUSES
205+
206+
:hide:`MONTHS`
207+
^^^^^^^^^^^^^^
208+
209+
.. autodata:: MONTHS
210+
191211
Other
192212
=====
193213

fpclib/__init__.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
9: 'FPSoftware\\Flash\\flashplayer9r277_win_sa.exe',
9393
-9: 'FPSoftware\\Flash\\9r16\\SAFlashPlayer.exe',
9494
-8: 'FPSoftware\\Flash\\8r22\\SAFlashPlayer.exe',
95-
7: 'FPSoftware\\Flash\\flashplayer29_0r0_171_win_sa.exe',
95+
7: 'FPSoftware\\Flash\\flashplayer_7_sa.exe',
9696
-7: 'FPSoftware\\Flash\\7r14\\SAFlashPlayer.exe',
9797
-6.21: 'FPSoftware\\Flash\\6r21\\SAFlashPlayer.exe',
9898
-6.4: 'FPSoftware\\Flash\\6r4\\SAFlashPlayer.exe',
@@ -119,7 +119,7 @@
119119
9 FPSoftware\\\\Flash\\\\flashplayer9r277_win_sa.exe
120120
-9 FPSoftware\\\\Flash\\\\9r16\\\\SAFlashPlayer.exe
121121
-8 FPSoftware\\\\Flash\\\\8r22\\\\SAFlashPlayer.exe
122-
7 FPSoftware\\\\Flash\\\\flashplayer29_0r0_171_win_sa.exe
122+
7 FPSoftware\\\\Flash\\\\flashplayer_7_sa.exe
123123
-7 FPSoftware\\\\Flash\\\\7r14\\\\SAFlashPlayer.exe
124124
-6.21 FPSoftware\\\\Flash\\\\6r21\\\\SAFlashPlayer.exe
125125
-6.4 FPSoftware\\\\Flash\\\\6r4\\\\SAFlashPlayer.exe
@@ -250,13 +250,29 @@
250250
:since 1.3:
251251
"""
252252
PLAY_MODES = {'Cooperative', 'Multiplayer', 'Single Player'}
253-
"""Set of all Flashpoint play modes. These may be combined with :code:`; `"""
253+
"""Set of all Flashpoint play modes. :code:`; ` can be used to combine them."""
254254
STATUSES = {'Hacked', 'Not Working', 'Partial', 'Playable', 'Hacked; Partial', 'Partial; Hacked'}
255255
"""Set of all valid Flashpoint statuses.
256256
257257
:since 1.3:
258258
"""
259259

260+
MONTHS = {
261+
"Jan": "01",
262+
"Feb": "02",
263+
"Mar": "03",
264+
"Apr": "04",
265+
"May": "05",
266+
"Jun": "06",
267+
"Jul": "07",
268+
"Aug": "08",
269+
"Sep": "09",
270+
"Oct": "10",
271+
"Nov": "11",
272+
"Dec": "12"
273+
}
274+
"""A dictionary mapping three letter month codes to 2 number month codes."""
275+
260276
DEBUG_LEVEL = 1
261277
"""A global value that determines what debug information gets printed. This applies to the whole module, and you can modify it when you want to. Possible values:
262278
@@ -1881,7 +1897,7 @@ def get_errors(self, rigid=False):
18811897
cmd = self.meta['Launch Command']
18821898
if not cmd:
18831899
errors.append('Launch Command: missing')
1884-
elif normalize(cmd, False, True) != cmd:
1900+
elif (cmd[0] != '"') and (" " not in cmd) and normalize(cmd, False, True) != cmd:
18851901
errors.append('Launch Command: formatted incorrectly. Use HTTP and don\'t use web.archive.org')
18861902
# Check Additional Applications
18871903
problems = []

metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def get_build():
1414
file.write(str(build))
1515

1616
NAME = 'fpclib'
17-
RELEASE = '1.5.1.' + get_build()
17+
RELEASE = '1.5.2.' + get_build()
1818
VERSION = re.match('\d+\.\d+', RELEASE).group(0)
1919
AUTHOR = 'mathgeniuszach'
2020

0 commit comments

Comments
 (0)