Skip to content
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

(4/5) Python3 #32

Merged
merged 9 commits into from
Mar 19, 2012
Merged

(4/5) Python3 #32

merged 9 commits into from
Mar 19, 2012

Conversation

macfreek
Copy link
Collaborator

This pull request is branched after pull request #31; please examine that request first. (The comments below are only about commits ee4a69b to 0ba7890. Let me know if this is problem and you want me to rebase this.)

These commits simply include changes required to run the test and six examples under both Python version 3 and 2.6 (2.7 and 3.2 were tested).

The only thing that failed was the map example under Python 3 for the simple reason that there seems no Python Image Library (PIL) for Python 3 yet.

This closes #15.

PS: due to other obligations, the next pull request may again be delayed, just in case you're wondering were number 5 went :)

This was referenced Mar 15, 2012
@twoolie
Copy link
Owner

twoolie commented Mar 18, 2012

This can't be automerged, I'll merge it tonight.

@macfreek
Copy link
Collaborator Author

If you need help, let me know.

By the way: I had no problems:

% git pull --all
% git checkout twoolie/master
% git merge macfreek/python3
Auto-merging README.md
Auto-merging README.txt
Merge made by recursive.
 README.md                      |    6 ++--
 README.txt                     |    6 ++--
 examples/block_analysis.py     |   56 ++++++++++++++++++++--------------------
 examples/chest_analysis.py     |   13 ++++-----
 examples/generate_level_dat.py |    2 +-
 examples/map.py                |   12 ++++----
 examples/mob_analysis.py       |   10 +++---
 examples/seed.py               |    6 ++--
 nbt/chunk.py                   |   24 ++++++++--------
 nbt/nbt.py                     |   16 ++++++++---
 nbt/region.py                  |   30 ++++++++++----------
 nbt/world.py                   |    5 ++-
 12 files changed, 97 insertions(+), 89 deletions(-)

@twoolie twoolie merged commit 0ba7890 into twoolie:master Mar 19, 2012
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.

py3k
2 participants