0
Commit Graph

46 Commits

Author SHA1 Message Date
Nicolas F
f314de1403 configParser: code style and string changes
It's now PEP8 compliant! Also we can remove an unused optparse
import (wtf?) and let logging.error do the string formatting lazily.
2019-07-24 05:35:40 +02:00
Nicolas F
e348a548b6 Initial Python 3 port
Many things work, some don't. Notably, genPOI doesn't work, and
there's some signedness comparison stuff going on in the C extension.

This also completely drops support for Python 2, as maintaining a C
extension for both Python 2 and 3 is a pain and not worth it for the
9 months that Python 2 is still going to be supported upstream.

The documentation needs to be adjusted as well.

All of the few tests we have pass, and rendering a map works, both
with a configuration file and without. We can also use optimizeimages.

Concerns #1528.
2019-03-17 17:57:07 +01:00
Aaron Griffith
df732bfa25 Revert "Merge remote-tracking branch 'exhuma/master', PR #963"
This reverts commit e26727943f, reversing
changes made to 7bbb077704.
2013-12-02 07:40:00 -05:00
Michel Albert
4112b5a72e Using a dedicated logger inside overviewer_core. 2013-07-28 15:04:51 +02:00
Andrew Chin
3889fd236f Don't print scary traceback if the config file can't be found 2013-03-15 20:05:30 -04:00
Andrew Chin
3d3ad4e4d6 Fix partial traceback printing on Windows 2012-11-29 21:03:33 -05:00
Andrew Chin
5ff9c507b7 Improved traceback printing when parsing settings file 2012-08-04 23:27:44 -04:00
Andrew Chin
1f19610707 Better missing config file error messages
Fixes #635
2012-03-06 09:11:29 -05:00
Andrew Brown
f8769c0a0d --forcerender, --check-tiles, and --no-tile-checks now work 2012-02-16 11:36:31 -05:00
Andrew Brown
2c412c3917 Added global defaults to config file which set renderdict defaults 2012-02-15 22:07:36 -05:00
Andrew Brown
f5d07fa597 Added a "did you mean" feature for config parsing 2012-02-14 21:12:15 -05:00
Andrew Brown
5e2956f101 fixed error message raising an error of its own 2012-02-12 16:11:06 -05:00
Andrew Brown
e7995e19b2 config parser ignores extra items in config files now 2012-02-11 16:02:15 -05:00
Andrew Brown
9319fee138 added processes option to command line and config file
Also the config file parser now just looks for all Settings objects in
settingsDefinitions.py, not the items in __all__
2012-02-08 21:05:02 -05:00
Andrew Brown
50ebdd7f2c clarified some comments and conformed some function names 2012-02-05 00:20:58 -05:00
Andrew Brown
324100206b changed the semantics of required and default in settings definitions.
I think it makes more logical sense now. Essentially, the default is
always used if the user doesn't specify a value. If there is no user
specified value and the default is None, then the action depends on the
value of required. required=True means raise an error. required=False
means silently omit that setting.
2012-02-04 22:06:29 -05:00
Andrew Brown
6d95d80a73 overhaul to configParser. Parsing config works now. 2012-02-04 21:23:44 -05:00
Andrew Brown
ceb98c4441 removed classes that are no longer used 2012-02-04 12:50:50 -05:00
Andrew Chin
2497a8a806 Part of an attempt to make config parser a little more generic 2012-01-28 18:57:12 -05:00
Andrew Chin
c29c983a79 Print a more user friendly error message on validation failure 2012-01-27 19:37:16 -05:00
Andrew Chin
39e5793634 No longer require an import from rendermodes in config file 2012-01-21 20:02:06 -05:00
Andrew Chin
163dd66a38 Create RegionSets via the World object 2012-01-21 19:04:21 -05:00
Andrew Chin
0537733bca Merge remote-tracking branch 'origin/rewrite' into rewrite 2012-01-07 23:05:02 -05:00
Andrew Chin
25db39463f The AssetManager will now create a kinda working html output 2012-01-07 23:04:42 -05:00
Aaron Griffith
4d61e41f9f fixed crash when an option isn't recognized 2012-01-07 22:51:09 -05:00
Andrew Chin
cb2f0129bc Allow regionsets to be named in a settings.py file 2012-01-07 15:11:19 -05:00
Andrew Chin
c14cd1a66f Fixed/added some config parsing tests 2012-01-02 01:13:29 -05:00
Andrew Chin
287b16fd13 Fixing some settings stuff 2012-01-02 00:03:10 -05:00
Andrew Chin
c2a1d8487a Start of the new rewrite code flow. TileSet still needs work 2012-01-01 16:12:10 -05:00
Andrew Chin
fed7ae0157 Allow global defaults to be specified 2011-12-31 20:59:02 -05:00
Andrew Brown
a2788cf84f removed an unneeded import 2011-12-28 16:10:17 -05:00
Andrew Chin
c7ee75d68d Started work on a MultiWorldParser to replace ConfigOptionParser 2011-12-24 01:10:58 -05:00
Aaron Griffith
a3653d429f fixed typo in configParser.py when parsing float values 2011-10-30 00:08:48 -04:00
Aaron Griffith
43629e928b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-09-06 10:29:15 -04:00
Aaron Griffith
40231598d8 command-line rendermodes can now be separated by ',', ':', or '/'
This should fix Issue #472.
2011-08-27 17:20:58 -04:00
Aaron Griffith
fe0d28630b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-08-18 11:40:26 -04:00
Thomas Lake
46c960b37d Use advanced command line options
Options specified as 'advanced' were being silently discarded due to an
error in 8c87fa6bb5
2011-08-16 16:17:38 +01:00
Aaron Griffith
e618e949c9 more indentation fixes 2011-08-15 15:48:05 -04:00
Thomas Lake
0c523461fa Fix tabs/spaces mixup in 8c87fa6bb5 2011-08-15 17:16:48 +01:00
Thomas Lake
8c87fa6bb5 Add new option "--advanced-help". Options previously marked
configFileOnly are now marked as "advanced" and will not appear in
default help text.
2011-08-15 17:02:19 +01:00
Aaron Griffith
a7753486dc Merge branch 'master' into rendermode-options 2011-07-12 12:20:09 -04:00
Aaron Griffith
fde647bfdf Merge branch 'py-package'
Conflicts:
	setup.py
2011-07-10 18:14:20 -04:00
Aaron Griffith
e84ef2c1d2 Merge branch 'master' into py-package
Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js
2011-05-13 21:37:35 -04:00
Aaron Griffith
383b01859f Merge branch 'master' into py-package
Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css
2011-05-10 20:19:10 -04:00
Aaron Griffith
115c36ad5e Merge branch 'dtt-c-render' into py-package
Conflicts:
	overviewer.py
2011-04-01 22:00:45 -04:00
Aaron Griffith
42596416d9 sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
2011-03-29 13:49:50 -04:00