Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[Sprint] Rc fixes #2193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
katyhuff wants to merge 24 commits into from
Closed

[Sprint] Rc fixes #2193

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2a85769
adds encoding as a function parameter
katyhuff Jun 29, 2013
b300ef3
when dealing with unicode strings, isinstance(u, basestring) will ret…
katyhuff Jun 29, 2013
7eb7ec0
Merge branch 'master' into unicode_rc
katyhuff Jun 29, 2013
aede120
undid enccoding parameter. This can be added later if the encoding ge…
katyhuff Jun 29, 2013
55475a0
adds a test file and a template rc file for the rc_setup tests.
katyhuff Jun 29, 2013
8df2f0b
default test passes.
katyhuff Jun 29, 2013
55d4b44
autopep8'd the test file.
katyhuff Jun 29, 2013
1cfedb9
The matplotlibrc template docstring.hardcopy must use a colon rather …
katyhuff Jun 29, 2013
09a2450
because of commas, Impact and Western were being merged
katyhuff Jun 29, 2013
6d79027
uncomments the matplotlibrc template
katyhuff Jun 29, 2013
a41204d
errors arose for some (but not all) of these parameters inside apostr…
katyhuff Jun 29, 2013
3840623
The matplotlibrc should match the default, which is (f, ctrl+f)
katyhuff Jun 29, 2013
1042544
template test passes.
katyhuff Jun 30, 2013
be48e7d
got rid of print statements from debugging
katyhuff Jun 30, 2013
09bf2dd
unicode test runs
katyhuff Jun 30, 2013
cda758d
merged unicode solution
katyhuff Jun 30, 2013
1976db5
unicode test passes
katyhuff Jun 30, 2013
7302c31
errant space.
katyhuff Jun 30, 2013
febaa0d
updates matplotlibrc.template to mat the defaults in the rcsetup module
katyhuff Jun 30, 2013
c3bfe6c
Merge branch 'master' into rc_fixes
katyhuff Jun 30, 2013
fa3f07d
getting up to date with master
katyhuff Jul 1, 2013
6bd355f
Merge branch 'master' into rc_fixes
katyhuff Jul 1, 2013
15b8b57
makes a proper docstring and removes the assert
katyhuff Jul 2, 2013
4ce865c
fixed typerror
katyhuff Jul 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
errors arose for some (but not all) of these parameters inside apostr… 
…ophes. Removing the apostrophes seemed to work. I'm curious about why this occured for some but not all variables. Anyway, my test complained about these but not the others.
  • Loading branch information
@katyhuff
katyhuff committed Jun 29, 2013
commit a41204d78671e561de826011a6e470105b4c459a
10 changes: 8 additions & 2 deletions lib/matplotlib/tests/test_rcsetup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ def test_defaults():
def test_template():
# the current matplotlibrc.template should validate successfully
mpl.rc_file(templaterc)
for k, v in templateParams.iteritems():
assert mpl.rcParams[k] == v[0]
with mpl.rc_context(fname=templaterc):
for k, v in mpl.rcsetup.defaultParams.iteritems():
if mpl.rcParams[k] != v[0]:
print k
print v[0]
print mpl.rcParams[k]
print "---------------"
assert mpl.rcParams[k] == v[0]


def test_unicode():
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/tests/test_rcsetup.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ text.dvipnghack : None # some versions of dvipng don't handle alpha
# correction off. None will try and
# guess based on your dvipng version

text.hinting : 'auto' # May be one of the following:
text.hinting : auto # May be one of the following:
# 'none': Perform no hinting
# 'auto': Use freetype's autohinter
# 'native': Use the hinting information in the
Expand Down Expand Up @@ -399,7 +399,7 @@ pdf.fonttype : 3 # Output Type 3 (Type3) or Type 42 (TrueType)
# svg backend params
svg.image_inline : True # write raster image data directly into the svg file
svg.image_noscale : False # suppress scaling of raster data embedded in SVG
svg.fonttype : 'path' # How to handle SVG fonts:
svg.fonttype : path # How to handle SVG fonts:
# 'none': Assume fonts are installed on the machine where the SVG will be viewed.
# 'path': Embed characters as paths -- supported by most SVG renderers
# 'svgfont': Embed characters as SVG fonts -- supported only by Chrome,
Expand Down Expand Up @@ -453,7 +453,7 @@ animation.writer : ffmpeg # MovieWriter 'backend' to use
animation.codec : mp4 # Codec to use for writing movie
animation.bitrate: -1 # Controls size/quality tradeoff for movie.
# -1 implies let utility auto-determine
animation.frame_format: 'png' # Controls frame format used by temp files
animation.frame_format: png # Controls frame format used by temp files
animation.ffmpeg_path: 'ffmpeg' # Path to ffmpeg binary. Without full path
# $PATH is searched
animation.ffmpeg_args: '' # Additional arguments to pass to ffmpeg
Expand Down
6 changes: 3 additions & 3 deletions matplotlibrc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ backend : %(backend)s
# correction off. None will try and
# guess based on your dvipng version

#text.hinting : 'auto' # May be one of the following:
#text.hinting : auto # May be one of the following:
# 'none': Perform no hinting
# 'auto': Use freetype's autohinter
# 'native': Use the hinting information in the
Expand Down Expand Up @@ -399,7 +399,7 @@ backend : %(backend)s
# svg backend params
#svg.image_inline : True # write raster image data directly into the svg file
#svg.image_noscale : False # suppress scaling of raster data embedded in SVG
#svg.fonttype : 'path' # How to handle SVG fonts:
#svg.fonttype : path # How to handle SVG fonts:
# 'none': Assume fonts are installed on the machine where the SVG will be viewed.
# 'path': Embed characters as paths -- supported by most SVG renderers
# 'svgfont': Embed characters as SVG fonts -- supported only by Chrome,
Expand Down Expand Up @@ -453,7 +453,7 @@ backend : %(backend)s
#animation.codec : mp4 # Codec to use for writing movie
#animation.bitrate: -1 # Controls size/quality tradeoff for movie.
# -1 implies let utility auto-determine
#animation.frame_format: 'png' # Controls frame format used by temp files
#animation.frame_format: png # Controls frame format used by temp files
#animation.ffmpeg_path: 'ffmpeg' # Path to ffmpeg binary. Without full path
# $PATH is searched
#animation.ffmpeg_args: '' # Additional arguments to pass to ffmpeg
Expand Down