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

Skip to content

Pass ints to Tk.Canvas.create_image V1.1.x #922

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.

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

Merged
merged 1 commit into from
Jun 6, 2012
Merged

Pass ints to Tk.Canvas.create_image V1.1.x #922

merged 1 commit into from
Jun 6, 2012

Conversation

cgohlke
Copy link
Contributor

@cgohlke cgohlke commented Jun 5, 2012

Backport from #865

@mdboom
Copy link
Member

mdboom commented Jun 5, 2012

+1

@pelson
Copy link
Member

pelson commented Jun 5, 2012

Seems like this was causing issues on a Windows 64-bit machine (not sure if that is relevant or not).

#865 was merged onto master, but could have been applied to v1.1.x, hence this PR.

@cgohlke
Copy link
Contributor Author

cgohlke commented Jun 5, 2012

See also #387 Fix Tk crash on locales with non-'.' decimal separator

pelson pushed a commit that referenced this pull request Jun 6, 2012
Pass ints to Tk.Canvas.create_image V1.1.x
@pelson pelson merged commit 3c4a7a6 into matplotlib:v1.1.x Jun 6, 2012
@pelson
Copy link
Member

pelson commented Jun 6, 2012

@WeatherGod / @mdboom or other dev: I have commited this pull request. In order to merge the v1.1.x branch back into master, can I simply do:

git co master
git fetch upstream
git pull upstream master
git merge upstream/v1.1.x
git push upstream_WRITEABLE master     #(my setup: upstream is read only, upstream_WRITABLE is full ssh access)

@mdboom
Copy link
Member

mdboom commented Jun 6, 2012

Yes -- that looks correct to me. I usually do a "git log" before the push just to make sure it did what I thought it would.

@WeatherGod
Copy link
Member

In addition, I always do a "--dry-run" for that final git push to make sure it is going to the correct location. This rule is actually much more important for pushing commits to your personal branches because it makes sure that you aren't accidentially pushing your personal work up to the official tree. This happened frequently when we initially started using git a year or two ago.

@pelson
Copy link
Member

pelson commented Jun 6, 2012

Thanks for the advice. Seems to have done the trick (c3c41a3...ea3c539).

@cgohlke thanks for doing this work & sorry for hijacking this issue with my commit questions ;-) .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants