pypy / pypy / module / sys / state.py

Author Commit Message Labels Comments Date
Antonio Cuni avatarAntonio Cuni
hg merge default
Branches
jitypes2
Antonio Cuni avatarAntonio Cuni
kill the minor version number in the lib-python subdirs, and store the corresponding revision in the cpython repo in a txt file instead
Branches
merge-stdlib-2.7.1
Antonio Cuni avatarAntonio Cuni
add lib-tk to the initial sys.path
Antonio Cuni avatarAntonio Cuni
partial merge of default; _ctypes/function.py had very hard conflicts, I'll try to manually merge the changes in the next commits
Branches
jitypes2
Amaury Forgeot d'Arc avatarAmaury Forgeot d'Arc
update modules rctime, sys
Branches
improve-unwrap_spec
Antonio Cuni avatarAntonio Cuni
merge default (which now includes fast-forward) into jitypes2
Branches
jitypes2
Amaury Forgeot d'Arc avatarAmaury Forgeot d'Arc
hg merge default
Branches
fast-forward
Antonio Cuni avatarAntonio Cuni
hg merge default
Branches
jitypes2
Hakan Ardo avatarHakan Ardo
hg --config ui.merge=internal:local merge 90600b6d6a68
Branches
jit-unroll-loops
Dan Villiom Podlaski Christiansen avatarDan Villiom Podlaski Christiansen
No-op merge to register the merge done in 0e3099e3cc33 with Mercurial.
Branches
fast-forward
Armin Rigo avatarArmin Rigo
Translation fix on OS/X.
Armin Rigo avatarArmin Rigo
Adds the path "lib-python/2.5.2/plat-SYS.PLATFORM" to sys.path too
Hakan Ardo avatarHakan Ardo
svn merge -r79225:HEAD svn+ssh://hakanardo@codespeak.net/svn/pypy/trunk
Branches
jit-unroll-loops
Hakan Ardo avatarHakan Ardo
Reverted merge, this branch curently does not play well with the freeing of old traces: svn merge -rHEAD:79592 .
Branches
jit-unroll-loops
Hakan Ardo avatarHakan Ardo
svn merge -r79225:HEAD svn+ssh://hakanardo@codespeak.net/svn/pypy/trunk
Branches
jit-unroll-loops
Antonio Cuni avatarAntonio Cuni
remove the possibility of putting the libraries in $PREFIX/lib/pypy1.3/*. It
Antonio Cuni avatarAntonio Cuni
merge the sys-prefix branch.
Amaury Forgeot d'Arc avatarAmaury Forgeot d'Arc
Merge from trunk:
Branches
fast-forward
Amaury Forgeot d'Arc avatarAmaury Forgeot d'Arc
Merge from trunk:
Branches
fast-forward
Benjamin Peterson avatarBenjamin Peterson
merge from trunk
Branches
fast-forward
Benjamin Peterson avatarBenjamin Peterson
merge from trunk
Branches
fast-forward
Benjamin Peterson avatarBenjamin Peterson
add modified dir for 2.7
Branches
fast-forward
Benjamin Peterson avatarBenjamin Peterson
move the cpython lib dirname out of a function
Branches
fast-forward
Benjamin Peterson avatarBenjamin Peterson
allow for a modified lib not to exist
Branches
fast-forward
Armin Rigo avatarArmin Rigo
Kill sys.prefix and sys.exec_prefix, and replace them with sys.pypy_prefix.
Maciej Fijalkowski avatarMaciej Fijalkowski
Check-in merge attempt. Diff is to huge to read it.
Armin Rigo avatarArmin Rigo
Move the 'file' class to interp-level and remove the direct app-level interface
Armin Rigo avatarArmin Rigo
Finish the merge of the pypy-more-rtti-inprogress branch.
Antonio Cuni avatarAntonio Cuni
remove this comment checked in by mistake
Antonio Cuni avatarAntonio Cuni
aargh. The annotator is too clever.
  1. Prev
  2. 1
  3. 2
  4. Next
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.