Permalink
Browse files

compatibility fix for the upcoming PyPy 1.5, which moved the location…

… of the lib-python files
  • Loading branch information...
1 parent b188b9c commit 12d37a624daeca227d6858e80be61c44c09375c4 @antocuni antocuni committed Apr 27, 2011
Showing with 38 additions and 27 deletions.
  1. +37 −26 virtualenv.py
  2. +1 −1 virtualenv_support/site.py
View
@@ -1620,36 +1620,37 @@ def convert(s):
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
-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
-AIOc2an2AKxRCP4P1A2QJQ==
+Xu7wKiGY1pNF/GQR+j4e3eFwdfzi+tEjZ+mMRgqHyp3v76vrDzEW3IAYLVO5OHyiEDtG+PdC1VDa
+ee1nGpoxnoY+sAVQ+iBwezyCTkHNwMHftrrF0TLGFbWDmBPGWiXwYUyUXzZG9gC5qUHp1AHaS76w
+RlCj5+tpZNjp0D4VfsOLOuC9JqjL33v3L3VFtwU7EJ7rY3u8G9U2HIjPHsFDIV0qQov2VWeH9o9c
+PC4S37fP18Pym6/vwtO1qYMV8gME9YjptPoDmWovyzx2YR6wdX4//z2c9+7iu0dTSfcaphVGNVhT
+vE74DVqnpjy2Ub8RSdyVidxKM/zUN4NnMFgcUTfVN+Fd0+f+d81dtwjszM1Ga2/u/lkrlwa6735+
+GaIBR1yaEA8q324FdlgXuGI80fv7w9lD/UHyu51wpnu0wn1gTDUB5iKJTTX2Rmtukrn7HYtVDvk6
+Ufdo3aCu7ky7d9awy/EPUbS8MY/P7WlbqrZYaA5kF47uh5py/d5UrlZqmuDdZFPy+6nWpOfQGU/y
+HV0tJRO1Mw4gXuABIAw36apAt/AXGANiC74jlUs1nJsaBA1NBY1OhaRKF5zM0d4mgIs5iUP9TZKQ
+SxxHmcTcm2qqsgIHfaRv0uQagqGyyxaoySlsEnVjUDc9JvpiRRyCC1fMcTxOHbHT71EHCMGndJxr
+grhmeDq174BfnrXHjtOJZQiZNxtZJXV75Ya/Y5mK75wR6BAmLrCTNWgls8MpLmKp5Q8HKYzb7fev
+tL/r+ft3nDUeW633cLaiHjob9ZhjzI7tMdycfrFXbrlXvSzoglbXyNtmLffZa0ZgKcz9UaQrdRjP
+b/WdNnxTIicZ0U1w+Ajk3j0C5VfKWrXGTopFw3nmKob+JSZ4ipZs8dDdZD0u6N9C5jNDO76vNyyz
+9Lan9jS2VNSu1aDiaUcbt8EtFrXdE9z6hcuPDG49+A8MbvVNcmBwND5aHwyWMt8TBbOacK9laxkB
++kyBSLjJ1rnUy5jMyC0Mhgg0/TKy16KyznROGxkzgRzZv6+HQPD1a8qtovSuRzLjDgWXvnTR4+8v
+Prw+vSBaTC9P3/zH6fdUOIKZ3I7NenD0nxeHTO1Dr0TVzQTozf6hwVtsB+455HMWGkLvfW+fdADC
+8JmaoQXtKjL39b4OvbMJ/U6A+N3T7kDdp7IHIff8M10H727xd2pJA/2UC//ML2f31DwymwgsDu0m
+gXnf5nW1jPbSXvsWzinB66sT7bfqm/H2pOTGthCUVgDTuchfNptrqvptzpAdle5l9VS9iieizK0S
+IIVz6dxuRhebMajavxW/AmWX4JYUO4wTe8MstePMtbJXJ+O21FzGhiDekaRRf36usC9ktocKQcAK
+T9/dxYgY/af3euzO6BMlrg7p8OMhKptr+wvXTDu5f0tx/7O2d+AoLqLgHSBovGwyd0/T9ul1IOeP
+EuXF0qm2B813BHRuxVMBe6PPxApxthMhBJJ67w4L+IiO+gIrB3m0mw72hlbPxOG+o3Hu0TAhnu9v
+uOicPtM9XnAPdU8P1ZgDSI4FxkqyfWfexHcEmXdaBF164zkfuL2n71qFr7dXz49t3hP5HV87ioQq
+XkaOYb9yKsbuvGjN6U7MUk2opAhjNufEpG5x7UBln2BfjNMrm98TB5ktWIY08t4P19uYHt4F0qMu
+ppb1jmFKInqixjQt56CBxt0+Gfen26qtPhA+NPEAID0VCLAQTE83OkVsO65EjZ7pqHDW0BWVbvI7
+dKSCClp8juAexvdr8et2p8OOD+rOKJr+3KDLgXrJQbjZd+BWYy8lst8kdKfe8sEeF4DPjQ73f/6A
+/v1SK9v9xV1+tW31cvCsEvuyWJ2HRQsdEpnHMRgZ0JsRaWss6TaCjvdBtHR0GaqdG/IFOn5U8YcX
+0FKAQc7sVHsA1igE/wfnXo9t
""")
+
##file ez_setup.py
EZ_SETUP_PY = convert("""
eJzNWmtv49a1/a5fwSgwJGE0NN8PDzRFmkyBAYrcIo8CFx5XPk+LHYpUSWoctch/v+ucQ1KkZDrt
@@ -1723,6 +1724,7 @@ def convert(s):
+
##file distribute_setup.py
DISTRIBUTE_SETUP_PY = convert("""
eJztG2tz28bxO3/FlRoNQJuEJCdpO5oyM04sp5q4tseSkw+2BjoCRxIRXsFDFPPru7t3BxyAAyXX
@@ -1808,6 +1810,7 @@ def convert(s):
+
##file activate.sh
ACTIVATE_SH = convert("""
eJytVU1v4jAQPW9+xTT0ANVS1GsrDlRFAqmFqmG72m0rY5IJsRRslDiktNr/vuMQ8tFQpNU2B4I9
@@ -1828,6 +1831,7 @@ def convert(s):
+
##file activate.fish
ACTIVATE_FISH = convert("""
eJydVm1v4jgQ/s6vmA1wBxUE7X2stJVYlVWR2lK13d6d9laRk0yIr8HmbIe0++tvnIQQB9pbXT5A
@@ -1853,6 +1857,7 @@ def convert(s):
+
##file activate.csh
ACTIVATE_CSH = convert("""
eJx9U11vmzAUffevOCVRu+UB9pws29Kl0iq1aVWllaZlcgxciiViItsQdb9+xiQp+dh4QOB7Pu49
@@ -1868,6 +1873,7 @@ def convert(s):
+
##file activate.bat
ACTIVATE_BAT = convert("""
eJyFUkEKgzAQvAfyhz0YaL9QEWpRqlSjWGspFPZQTevFHOr/adQaU1GaUzI7Mzu7ZF89XhKkEJS8
@@ -1878,6 +1884,7 @@ def convert(s):
+
##file deactivate.bat
DEACTIVATE_BAT = convert("""
eJxzSE3OyFfIT0vj4spMU0hJTcvMS01RiPf3cYkP8wwKCXX0iQ8I8vcNCFHQ4FIAguLUEgWIgK0q
@@ -1887,6 +1894,7 @@ def convert(s):
+
##file distutils-init.py
DISTUTILS_INIT = convert("""
eJytV92L4zYQf/dfMU0ottuse7RvC6FQrg8Lxz2Ugz4si9HacqKuIxlJ2ST313dG8odkO9d7aGBB
@@ -1915,6 +1923,7 @@ def convert(s):
+
##file distutils.cfg
DISTUTILS_CFG = convert("""
eJxNj00KwkAMhfc9xYNuxe4Ft57AjYiUtDO1wXSmNJnK3N5pdSEEAu8nH6lxHVlRhtDHMPATA4uH
@@ -1924,6 +1933,7 @@ def convert(s):
+
##file activate_this.py
ACTIVATE_THIS = convert("""
eJyNUlGL2zAMfvevEBlHEujSsXsL9GGDvW1jD3sZpQQ3Ua7aJXawnbT595Ocpe0dO5ghseVP+vRJ
@@ -1939,6 +1949,7 @@ def convert(s):
+
if __name__ == '__main__':
main()
@@ -553,7 +553,7 @@ def virtual_install_main_packages():
elif _is_jython:
paths = [os.path.join(sys.real_prefix, 'Lib')]
elif _is_pypy:
- cpyver = '%d.%d.%d' % sys.version_info[:3]
+ cpyver = '%d.%d' % sys.version_info[:2]
paths = [os.path.join(sys.real_prefix, 'lib_pypy'),
os.path.join(sys.real_prefix, 'lib-python', 'modified-%s' % cpyver),
os.path.join(sys.real_prefix, 'lib-python', cpyver)]

0 comments on commit 12d37a6

Please sign in to comment.