pygame is sharing code with you

Bitbucket is a code hosting site. Unlimited public and private repositories. Free for small teams.

Don't show this again

pygame / pygame http://pygame.org/

Clone this repository (size: 15.4 MB): HTTPS / SSH
hg clone https://bitbucket.org/pygame/pygame
hg clone ssh://hg@bitbucket.org/pygame/pygame

pull into pygame?

Conflicts detected

Unfortunately this pull request cannot be automatically pulled and merged until the conflicts listed below are resolved.

If you would like to manually merge this pull request, execute the following commands:

$ hg pull -r default https://bitbucket.org/stefanor/pygame-pypy$ hg update default
$ hg merge 612e34d48a53
$ hg commit -m 'Merged in stefanor/pygame-pypy (pull request #1)'

stefanor / pygame-pypy

Branch
default

pygame / pygame

Branch
default

Description

Hellos,

can I pull this work into pygame? How did you go with it? Did you get it running in pypy?

I'd probably change the src/pgcompat.h ifdef so it checks for some PYPY define as well as the python version number. As well, the portmidi part probably needs some work so that it can be good for both pythons.

cheers,

Comments

    Log in to comment »