sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge with master

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-24 21:46:48 -08:00
parent 4273a08e52
commit c1b3f3000d
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bindings/python/mapnik/__init__.py
View file

@ -1004,7 +1004,12 @@ def mapnik_version_from_string(version_string):
def register_plugins(path=None):
"""Register plugins located by specified path"""
DatasourceCache.instance().register_datasources(path)
if not path:
if os.environ.has_key('MAPNIK_INPUT_PLUGINS_DIRECTORY'):
path = os.environ.get('MAPNIK_INPUT_PLUGINS_DIRECTORY')
else:
path = inputpluginspath
DatasourceCache.register_datasources(path)
def register_fonts(path=None,valid_extensions=['.ttf','.otf','.ttc','.pfa','.pfb','.ttc','.dfont']):
"""Recursively register fonts using path argument as base directory"""