be compatible with both old pypys and pypy >= 1.5

virtualenv.py

@@ -1619,38 +1619,39 @@ def convert(s):
 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
-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
-0FKAQc7sVHsA1igE/wfnXo9t
+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
 """)
 
 
 
 
+
 ##file ez_setup.py
 EZ_SETUP_PY = convert("""
 eJzNWmtv49a1/a5fwSgwJGE0NN8PDzRFmkyBAYrcIo8CFx5XPk+LHYpUSWoctch/v+ucQ1KkZDrt
@@ -1725,6 +1726,7 @@ def convert(s):
 
 
 
+
 ##file distribute_setup.py
 DISTRIBUTE_SETUP_PY = convert("""
 eJztG2tz28bxO3/FlRoNQJuEJCdpO5oyM04sp5q4tseSkw+2BjoCRxIRXsFDFPPru7t3BxyAAyXX
@@ -1811,6 +1813,7 @@ def convert(s):
 
 
 
+
 ##file activate.sh
 ACTIVATE_SH = convert("""
 eJytVU1v4jAQPW9+xTT0ANVS1GsrDlRFAqmFqmG72m0rY5IJsRRslDiktNr/vuMQ8tFQpNU2B4I9
@@ -1832,6 +1835,7 @@ def convert(s):
 
 
 
+
 ##file activate.fish
 ACTIVATE_FISH = convert("""
 eJydVm1v4jgQ/s6vmA1wBxUE7X2stJVYlVWR2lK13d6d9laRk0yIr8HmbIe0++tvnIQQB9pbXT5A
@@ -1858,6 +1862,7 @@ def convert(s):
 
 
 
+
 ##file activate.csh
 ACTIVATE_CSH = convert("""
 eJx9U11vmzAUffevOCVRu+UB9pws29Kl0iq1aVWllaZlcgxciiViItsQdb9+xiQp+dh4QOB7Pu49
@@ -1874,6 +1879,7 @@ def convert(s):
 
 
 
+
 ##file activate.bat
 ACTIVATE_BAT = convert("""
 eJyFUkEKgzAQvAfyhz0YaL9QEWpRqlSjWGspFPZQTevFHOr/adQaU1GaUzI7Mzu7ZF89XhKkEJS8
@@ -1885,6 +1891,7 @@ def convert(s):
 
 
 
+
 ##file deactivate.bat
 DEACTIVATE_BAT = convert("""
 eJxzSE3OyFfIT0vj4spMU0hJTcvMS01RiPf3cYkP8wwKCXX0iQ8I8vcNCFHQ4FIAguLUEgWIgK0q
@@ -1895,6 +1902,7 @@ def convert(s):
 
 
 
+
 ##file distutils-init.py
 DISTUTILS_INIT = convert("""
 eJytV92L4zYQf/dfMU0ottuse7RvC6FQrg8Lxz2Ugz4si9HacqKuIxlJ2ST313dG8odkO9d7aGBB
@@ -1924,6 +1932,7 @@ def convert(s):
 
 
 
+
 ##file distutils.cfg
 DISTUTILS_CFG = convert("""
 eJxNj00KwkAMhfc9xYNuxe4Ft57AjYiUtDO1wXSmNJnK3N5pdSEEAu8nH6lxHVlRhtDHMPATA4uH
@@ -1934,6 +1943,7 @@ def convert(s):
 
 
 
+
 ##file activate_this.py
 ACTIVATE_THIS = convert("""
 eJyNUlGL2zAMfvevEBlHEujSsXsL9GGDvW1jD3sZpQQ3Ua7aJXawnbT595Ocpe0dO5ghseVP+vRJ
@@ -1950,6 +1960,7 @@ def convert(s):
 
 
 
+
 if __name__ == '__main__':
     main()
 

virtualenv_support/site.py

@@ -553,7 +553,10 @@ def virtual_install_main_packages():
     elif _is_jython:
         paths = [os.path.join(sys.real_prefix, 'Lib')]
     elif _is_pypy:
-        cpyver = '%d.%d' % sys.version_info[:2]
+        if sys.pypy_version_info >= (1, 5):
+            cpyver = '%d.%d' % sys.version_info[:2]
+        else:
+            cpyver = '%d.%d.%d' % sys.version_info[:3]
         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)]