[Python-modules-commits] [python-mplexporter] 129/135: merge PR #23 from origin/fix-solid-linestyle, resolve conflict

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-mplexporter.

commit 9fbaa16050899f34e721acba8bca0b6cb3e23c0c
Merge: 2766ea5 253b162
Author: A. Flaxman <abie at alum.mit.edu>
Date:   Sat Jul 5 14:28:51 2014 -0700

    merge PR #23 from origin/fix-solid-linestyle, resolve conflict

 mplexporter/tests/test_utils.py | 11 +++++++++++
 mplexporter/utils.py            |  4 ++++
 2 files changed, 15 insertions(+)

diff --cc mplexporter/tests/test_utils.py
index 8ce0f9b,1267ca9..eb85fbb
--- a/mplexporter/tests/test_utils.py
+++ b/mplexporter/tests/test_utils.py
@@@ -10,14 -10,11 +10,25 @@@ def test_path_data()
      assert_allclose(vertices.shape, (25, 2))
      assert_equal(codes, ['M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'Z'])
  
 +
 +def test_linestyle():
 +    linestyles = {'solid': 'none', '-': 'none',
 +                  'dashed': '6,6', '--': '6,6',
 +                  'dotted': '2,2', ':': '2,2',
 +                  'dashdot': '4,4,2,4', '-.': '4,4,2,4',
 +                  '': None, 'None': None}
 +
 +    for ls, result in linestyles.items():
 +        line, = plt.plot([1, 2, 3], linestyle=ls)
 +        assert_equal(utils.get_dasharray(line), result)
++
++
+ def test_axis_w_fixed_formatter():
+     positions, labels = [0, 1, 10], ['A','B','C']
+ 
+     plt.xticks(positions, labels)
+     props = utils.get_axis_properties(plt.gca().xaxis)
+ 
+     assert_equal(props['tickvalues'], positions)
+     assert_equal(props['tickformat'], labels)
++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mplexporter.git