Skip to content

Commit 56a8541

Browse files
author
Jeff Whitaker
committed
move toolkits to mpl_toolkits, make mpl_toolkits a namespace package.
svn path=/trunk/matplotlib/; revision=4836
1 parent ef9bc0d commit 56a8541

File tree

7 files changed

+9
-6
lines changed

7 files changed

+9
-6
lines changed

API_CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
toolkits must now be imported from mpl_toolkits (not matplotlib.toolkits)
2+
13
TRANSFORMS REFACTORING
24

35
The primary goal of this refactoring was to make it easier to

lib/matplotlib/toolkits/__init__.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

lib/mpl_toolkits/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
try:
2+
__import__('pkg_resources').declare_namespace(__name__)
3+
except ImportError:
4+
pass # must not have setuptools

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
'matplotlib',
5656
'matplotlib.backends',
5757
'matplotlib.projections',
58-
'matplotlib.toolkits',
58+
# 'matplotlib.toolkits',
59+
'mpl_toolkits',
5960
'matplotlib.numerix',
6061
'matplotlib.numerix.mlab',
6162
'matplotlib.numerix.ma',

setupegg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
from setuptools import setup
66
execfile('setup.py',
77
{'additional_params' :
8-
{'namespace_packages' : ['matplotlib.toolkits']}})
8+
{'namespace_packages' : ['mpl_toolkits']}})

0 commit comments

Comments
 (0)