only mark deprecated api names for removal at major versions to ensure we are semver compatible - thanks @migurski - closes #1129

This commit is contained in:
Dane Springmeyer 2012-06-06 17:32:16 -07:00
parent 2b5ad5bd7e
commit c8848c8a9b

View file

@ -67,13 +67,13 @@ class _MapnikMetaclass(BoostPythonMetaclass):
_injector = _MapnikMetaclass('_injector', (object, ), {}) _injector = _MapnikMetaclass('_injector', (object, ), {})
def Filter(*args,**kwargs): def Filter(*args,**kwargs):
warnings.warn("'Filter' is deprecated and will be removed in Mapnik 2.0.1, use 'Expression' instead", warnings.warn("'Filter' is deprecated and will be removed in Mapnik 3.x, use 'Expression' instead",
DeprecationWarning, 2) DeprecationWarning, 2)
return Expression(*args, **kwargs) return Expression(*args, **kwargs)
class Envelope(Box2d): class Envelope(Box2d):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
warnings.warn("'Envelope' is deprecated and will be removed in Mapnik 2.0.1, use 'Box2d' instead", warnings.warn("'Envelope' is deprecated and will be removed in Mapnik 3.x, use 'Box2d' instead",
DeprecationWarning, 2) DeprecationWarning, 2)
Box2d.__init__(self, *args, **kwargs) Box2d.__init__(self, *args, **kwargs)
@ -623,4 +623,4 @@ def register_fonts(path=fontscollectionpath,valid_extensions=['.ttf','.otf','.tt
# auto-register known plugins and fonts # auto-register known plugins and fonts
register_plugins() register_plugins()
register_fonts() register_fonts()