`e.g.` and `i.e.` look nicer than `eg` and `ie` #3748

yuvallanger · 2014-11-01T15:18:51Z

Adding many more eg to e.g. replacements.

I ran:

 find agg24/ CXX CXX5 doc examples/ lib/ LICENSE/ release/ src/ test/ ttconv/ unit/ -type f -exec sed -i 's/\beg\b/e.g./g' {} \;

and then manually filtered for errors.

tacaswell · 2014-11-01T15:22:39Z

Didn't we do a massive amount of work recently to standardize the other way?

yuvallanger · 2014-11-01T15:23:36Z

I'm terribly sorry. I should have asked before doing anything.

tacaswell · 2014-11-01T15:26:23Z

@yuvallanger No worries, I'm sorry you did a bunch of redundent work!

See: #1916 (original issues #1423) and we standardized on 'e.g.'. I suspect that is the reason that the PR won't merge cleanly.

WeatherGod · 2014-11-01T15:29:29Z

Could probably use similar work for things like "ie" to "i.e."

On Sat, Nov 1, 2014 at 11:26 AM, Thomas A Caswell notifications@github.com
wrote:

@yuvallanger https://github.com/yuvallanger No worries, I'm sorry you
did a bunch of redundent work!

See: #1916 #1916 (original
issues #1423 #1423) and
we standardized on 'e.g.'. I suspect that is the reason that the PR won't
merge cleanly.

—
Reply to this email directly or view it on GitHub
#3748 (comment)
.

yuvallanger · 2014-11-01T15:30:11Z

@tacaswell The reason is that I used v1.0.x-maint as the guidelines suggested. @WeatherGod said I should ask for a pull request into v1.4.x instead, but I forgot I used v1.0.x-maint as my.. hmm.. what is the technically correct term here? Source branch? Base branch?

Anyways, it's my fault alone.

tacaswell · 2014-11-01T15:35:49Z

I would suggest checking out the latest branch (either 1.4.x or master, lean towards v1.4.x) and re-run that command.

And where do the docs suggest working against 1.0.x-maint? That should not there (that branch was last touched in 2011)...

yuvallanger · 2014-11-01T15:42:40Z

CONTRIBUTING.md leads to:

http://matplotlib.org/devel/coding_guide.html

where it says: In general, simple bugfixes that are unlikely to introduce new bugs of their own should be merged onto the maintenance branch.

I figured that means I should PR into the branch saying maint...

yuvallanger · 2014-11-01T15:51:53Z

Will it be alright if I follow #1916 and replace eg with e.g., instead of e.g. and also place a comma after all bare e.g.? Is it possible to follow-up directly in #1916?

tacaswell · 2014-11-01T15:54:27Z

Ah, fair enough. That documentation should be clarified and the old branches should probably be removed.

I would strongly suggest working off of 1.4.x (which is now the 'maintenance branch') as other PRs could have changed the same doc strings between now and where ever you base you edits from which will result is (really hard to resolve) conflicts when we try to merge the changes into 1.4.x.

Used: ```bash find * -type f -exec sed -i 's/\beg,/e.g.,/g' {} \; ```

Used: ```bash find * -type f -exec sed -i 's/\beg\b/e.g.,/g' {} \; ```

yuvallanger · 2014-11-01T17:00:48Z

That's it. I hope you like it. I don't know much about style guidelines, so I won't change anything further.

I should probably use this same PR for the ie to i.e..

Used: ```bash find * -type f -exec sed -i 's/\bie,/i.e.,/g' {} \; ```

tacaswell · 2014-11-01T17:32:25Z

======================================================================

FAIL: matplotlib.tests.test_coding_standards.test_pep8_conformance

----------------------------------------------------------------------

Traceback (most recent call last):

File "/home/travis/virtualenv/python2.7.8/lib/python2.7/site-packages/nose/case.py", line 197, in runTest

self.test(*self.arg)

File "/home/travis/virtualenv/python2.7.8/lib/python2.7/site-packages/matplotlib-1.4.x-py2.7-linux-x86_64.egg/matplotlib/tests/test_coding_standards.py", line 252, in test_pep8_conformance

assert_pep8_conformance()

File "/home/travis/virtualenv/python2.7.8/lib/python2.7/site-packages/matplotlib-1.4.x-py2.7-linux-x86_64.egg/matplotlib/tests/test_coding_standards.py", line 236, in assert_pep8_conformance

assert_equal(result.total_errors, 0, msg)

AssertionError: Found code syntax errors (and warnings):

/home/travis/virtualenv/python2.7.8/lib/python2.7/site-packages/matplotlib-1.4.x-py2.7-linux-x86_64.egg/matplotlib/axes/_axes.py:5423:80: E501 line too long (80 > 79 characters)

----------------------------------------------------------------------

Adding the dots apparently made one of the lines too long, can you please fix that?

tacaswell · 2014-11-01T17:38:08Z

lib/matplotlib/axes/_axes.py

@@ -5420,7 +5420,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
        normed : boolean, optional, default: False
            If `True`, the first element of the return tuple will
            be the counts normalized to form a probability density, i.e.,
-            ``n/(len(x)`dbin)``, ie the integral of the histogram will sum to
+            ``n/(len(x)`dbin)``, i.e., the integral of the histogram will sum to


This is the line that is now too long.

Used: ```bash find * -type f -exec sed -i 's/\bie\b/i.e.,/g' {} \; ``` Restructuring >80 character docstring

DOC : `e.g.` and `i.e.` look nicer than `eg` and `ie`

tacaswell · 2014-11-02T04:43:15Z

Thanks!

Congratulations on your first mpl commits (I think).

eg, to e.g.,

274af80

Used: ```bash find * -type f -exec sed -i 's/\beg,/e.g.,/g' {} \; ```

yuvallanger force-pushed the patch-eg-with-dots branch from d85b990 to 03e6f11 Compare November 1, 2014 16:45

eg (without a comma) to e.g.,

ef80b70

Used: ```bash find * -type f -exec sed -i 's/\beg\b/e.g.,/g' {} \; ```

yuvallanger force-pushed the patch-eg-with-dots branch from 03e6f11 to ef80b70 Compare November 1, 2014 16:55

ie, to i.e.,

3b9ef13

Used: ```bash find * -type f -exec sed -i 's/\bie,/i.e.,/g' {} \; ```

yuvallanger mentioned this pull request Nov 1, 2014

Change ie into i.e. #3749

Closed

yuvallanger changed the title ~~e.g. looks nicer than eg~~ e.g. and i.e. look nicer than eg and ie Nov 1, 2014

tacaswell added this to the v1.4.3 milestone Nov 1, 2014

tacaswell added Documentation status: needs review status: needs revision and removed status: needs review labels Nov 1, 2014

tacaswell reviewed Nov 1, 2014
View reviewed changes

ie (without a comma) to i.e.,

2213ac8

Used: ```bash find * -type f -exec sed -i 's/\bie\b/i.e.,/g' {} \; ``` Restructuring >80 character docstring

yuvallanger force-pushed the patch-eg-with-dots branch from 546466b to 2213ac8 Compare November 1, 2014 17:42

tacaswell added a commit that referenced this pull request Nov 1, 2014

Merge pull request #3748 from yuvallanger/patch-eg-with-dots

7722bab

DOC : `e.g.` and `i.e.` look nicer than `eg` and `ie`

tacaswell merged commit 7722bab into matplotlib:v1.4.x Nov 1, 2014

yuvallanger mentioned this pull request Nov 2, 2014

Some more i.e. and e.g. changes #3751

Merged

QuLogic removed the status: needs revision label Nov 24, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GitHub Sponsors

Uh oh!

`e.g.` and `i.e.` look nicer than `eg` and `ie` #3748

`e.g.` and `i.e.` look nicer than `eg` and `ie` #3748

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

WeatherGod commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

tacaswell Nov 1, 2014

Uh oh!

tacaswell commented Nov 2, 2014

Uh oh!

e.g. and i.e. look nicer than eg and ie #3748

e.g. and i.e. look nicer than eg and ie #3748

Conversation

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

WeatherGod commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

yuvallanger commented Nov 1, 2014

Uh oh!

tacaswell commented Nov 1, 2014

Uh oh!

tacaswell Nov 1, 2014

Choose a reason for hiding this comment

Uh oh!

tacaswell commented Nov 2, 2014

Uh oh!

`e.g.` and `i.e.` look nicer than `eg` and `ie` #3748

`e.g.` and `i.e.` look nicer than `eg` and `ie` #3748