[pypy-commit] pypy numpypy-array_prepare_-array_wrap: Merge default
rguillebert
noreply at buildbot.pypy.org
Thu Oct 17 17:40:40 CEST 2013
Author: Romain Guillebert <romain.py at gmail.com>
Branch: numpypy-array_prepare_-array_wrap
Changeset: r67462:18c46a0fd930
Date: 2013-10-17 17:39 +0200
http://bitbucket.org/pypy/pypy/changeset/18c46a0fd930/
Log: Merge default
diff too long, truncating to 2000 out of 3739 lines
diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
--- a/TODO.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-TODO list by mattip
-===================
-
-- test, implement use of __array_prepare__()
-- test, implement use of __array_wrap__()
diff --git a/lib-python/2.7/test/keycert.pem b/lib-python/2.7/test/keycert.pem
--- a/lib-python/2.7/test/keycert.pem
+++ b/lib-python/2.7/test/keycert.pem
@@ -1,32 +1,31 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQC8ddrhm+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9L
-opdJhTvbGfEj0DQs1IE8M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVH
-fhi/VwovESJlaBOp+WMnfhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQAB
-AoGBAK0FZpaKj6WnJZN0RqhhK+ggtBWwBnc0U/ozgKz2j1s3fsShYeiGtW6CK5nU
-D1dZ5wzhbGThI7LiOXDvRucc9n7vUgi0alqPQ/PFodPxAN/eEYkmXQ7W2k7zwsDA
-IUK0KUhktQbLu8qF/m8qM86ba9y9/9YkXuQbZ3COl5ahTZrhAkEA301P08RKv3KM
-oXnGU2UHTuJ1MAD2hOrPxjD4/wxA/39EWG9bZczbJyggB4RHu0I3NOSFjAm3HQm0
-ANOu5QK9owJBANgOeLfNNcF4pp+UikRFqxk5hULqRAWzVxVrWe85FlPm0VVmHbb/
-loif7mqjU8o1jTd/LM7RD9f2usZyE2psaw8CQQCNLhkpX3KO5kKJmS9N7JMZSc4j
-oog58yeYO8BBqKKzpug0LXuQultYv2K4veaIO04iL9VLe5z9S/Q1jaCHBBuXAkEA
-z8gjGoi1AOp6PBBLZNsncCvcV/0aC+1se4HxTNo2+duKSDnbq+ljqOM+E7odU+Nq
-ewvIWOG//e8fssd0mq3HywJBAJ8l/c8GVmrpFTx8r/nZ2Pyyjt3dH1widooDXYSV
-q6Gbf41Llo5sYAtmxdndTLASuHKecacTgZVhy0FryZpLKrU=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANtb0+YrKuxevGpm
+LrjaUhZSgz6zFAmuGFmKmUbdjmfv9zSmmdsQIksK++jK0Be9LeZy20j6ahOfuVa0
+ufEmPoP7Fy4hXegKZR9cCWcIe/A6H2xWF1IIJLRTLaU8ol/I7T+um5HD5AwAwNPP
+USNU0Eegmvp+xxWu3NX2m1Veot85AgMBAAECgYA3ZdZ673X0oexFlq7AAmrutkHt
+CL7LvwrpOiaBjhyTxTeSNWzvtQBkIU8DOI0bIazA4UreAFffwtvEuPmonDb3F+Iq
+SMAu42XcGyVZEl+gHlTPU9XRX7nTOXVt+MlRRRxL6t9GkGfUAXI3XxJDXW3c0vBK
+UL9xqD8cORXOfE06rQJBAP8mEX1ERkR64Ptsoe4281vjTlNfIbs7NMPkUnrn9N/Y
+BLhjNIfQ3HFZG8BTMLfX7kCS9D593DW5tV4Z9BP/c6cCQQDcFzCcVArNh2JSywOQ
+ZfTfRbJg/Z5Lt9Fkngv1meeGNPgIMLN8Sg679pAOOWmzdMO3V706rNPzSVMME7E5
+oPIfAkEA8pDddarP5tCvTTgUpmTFbakm0KoTZm2+FzHcnA4jRh+XNTjTOv98Y6Ik
+eO5d1ZnKXseWvkZncQgxfdnMqqpj5wJAcNq/RVne1DbYlwWchT2Si65MYmmJ8t+F
+0mcsULqjOnEMwf5e+ptq5LzwbyrHZYq5FNk7ocufPv/ZQrcSSC+cFwJBAKvOJByS
+x56qyGeZLOQlWS2JS3KJo59XuLFGqcbgN9Om9xFa41Yb4N9NvplFivsvZdw3m1Q/
+SPIXQuT8RMPDVNQ=
+-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
-MIICpzCCAhCgAwIBAgIJAP+qStv1cIGNMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIRGVsYXdhcmUxEzARBgNVBAcTCldpbG1pbmd0b24x
-IzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMQwwCgYDVQQLEwNT
-U0wxHzAdBgNVBAMTFnNvbWVtYWNoaW5lLnB5dGhvbi5vcmcwHhcNMDcwODI3MTY1
-NDUwWhcNMTMwMjE2MTY1NDUwWjCBiTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCERl
-bGF3YXJlMRMwEQYDVQQHEwpXaWxtaW5ndG9uMSMwIQYDVQQKExpQeXRob24gU29m
-dHdhcmUgRm91bmRhdGlvbjEMMAoGA1UECxMDU1NMMR8wHQYDVQQDExZzb21lbWFj
-aGluZS5weXRob24ub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ddrh
-m+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9LopdJhTvbGfEj0DQs1IE8
-M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVHfhi/VwovESJlaBOp+WMn
-fhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQABoxUwEzARBglghkgBhvhC
-AQEEBAMCBkAwDQYJKoZIhvcNAQEFBQADgYEAF4Q5BVqmCOLv1n8je/Jw9K669VXb
-08hyGzQhkemEBYQd6fzQ9A/1ZzHkJKb1P6yreOLSEh4KcxYPyrLRC1ll8nr5OlCx
-CMhKkTnR6qBsdNV0XtdU2+N25hqW+Ma4ZeqsN/iiJVCGNOZGnvQuvCAGWF8+J/f/
-iHkC6gGdBJhogs4=
+MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
+BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u
+IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw
+MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH
+Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k
+YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7
+6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt
+pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw
+FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd
+BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G
+lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1
+CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX
-----END CERTIFICATE-----
diff --git a/lib-python/2.7/test/sha256.pem b/lib-python/2.7/test/sha256.pem
--- a/lib-python/2.7/test/sha256.pem
+++ b/lib-python/2.7/test/sha256.pem
@@ -1,129 +1,128 @@
# Certificate chain for https://sha256.tbs-internet.com
- 0 s:/C=FR/postalCode=14000/ST=Calvados/L=CAEN/street=22 rue de Bretagne/O=TBS INTERNET/OU=0002 440443810/OU=sha-256 production/CN=sha256.tbs-internet.com
- i:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA SGC
+ 0 s:/C=FR/postalCode=14000/ST=Calvados/L=CAEN/street=22 rue de Bretagne/O=TBS INTERNET/OU=0002 440443810/OU=Certificats TBS X509/CN=ecom.tbs-x509.com
+ i:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA business
-----BEGIN CERTIFICATE-----
-MIIGXTCCBUWgAwIBAgIRAMmag+ygSAdxZsbyzYjhuW0wDQYJKoZIhvcNAQELBQAw
-gcQxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl
+MIIGTjCCBTagAwIBAgIQOh3d9dNDPq1cSdJmEiMpqDANBgkqhkiG9w0BAQUFADCB
+yTELMAkGA1UEBhMCRlIxETAPBgNVBAgTCENhbHZhZG9zMQ0wCwYDVQQHEwRDYWVu
+MRUwEwYDVQQKEwxUQlMgSU5URVJORVQxSDBGBgNVBAsTP1Rlcm1zIGFuZCBDb25k
+aXRpb25zOiBodHRwOi8vd3d3LnRicy1pbnRlcm5ldC5jb20vQ0EvcmVwb3NpdG9y
+eTEYMBYGA1UECxMPVEJTIElOVEVSTkVUIENBMR0wGwYDVQQDExRUQlMgWDUwOSBD
+QSBidXNpbmVzczAeFw0xMTAxMjUwMDAwMDBaFw0xMzAyMDUyMzU5NTlaMIHHMQsw
+CQYDVQQGEwJGUjEOMAwGA1UEERMFMTQwMDAxETAPBgNVBAgTCENhbHZhZG9zMQ0w
+CwYDVQQHEwRDQUVOMRswGQYDVQQJExIyMiBydWUgZGUgQnJldGFnbmUxFTATBgNV
+BAoTDFRCUyBJTlRFUk5FVDEXMBUGA1UECxMOMDAwMiA0NDA0NDM4MTAxHTAbBgNV
+BAsTFENlcnRpZmljYXRzIFRCUyBYNTA5MRowGAYDVQQDExFlY29tLnRicy14NTA5
+LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKRrlHUnJ++1lpcg
+jtYco7cdmRe+EEfTmwPfCdfV3G1QfsTSvY6FfMpm/83pqHfT+4ANwr18wD9ZrAEN
+G16mf9VdCGK12+TP7DmqeZyGIqlFFoahQnmb8EarvE43/1UeQ2CV9XmzwZvpqeli
+LfXsFonawrY3H6ZnMwS64St61Z+9gdyuZ/RbsoZBbT5KUjDEG844QRU4OT1IGeEI
+eY5NM5RNIh6ZNhVtqeeCxMS7afONkHQrOco73RdSTRck/Hj96Ofl3MHNHryr+AMK
+DGFk1kLCZGpPdXtkxXvaDeQoiYDlil26CWc+YK6xyDPMdsWvoG14ZLyCpzMXA7/7
+4YAQRH0CAwEAAaOCAjAwggIsMB8GA1UdIwQYMBaAFBoJBMz5CY+7HqDO1KQUf0vV
+I1jNMB0GA1UdDgQWBBQgOU8HsWzbmD4WZP5Wtdw7jca2WDAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+TAYDVR0gBEUwQzBBBgsrBgEEAYDlNwIBATAyMDAGCCsGAQUFBwIBFiRodHRwczov
+L3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL0NQUzEwdwYDVR0fBHAwbjA3oDWgM4Yx
+aHR0cDovL2NybC50YnMtaW50ZXJuZXQuY29tL1RCU1g1MDlDQWJ1c2luZXNzLmNy
+bDAzoDGgL4YtaHR0cDovL2NybC50YnMteDUwOS5jb20vVEJTWDUwOUNBYnVzaW5l
+c3MuY3JsMIGwBggrBgEFBQcBAQSBozCBoDA9BggrBgEFBQcwAoYxaHR0cDovL2Ny
+dC50YnMtaW50ZXJuZXQuY29tL1RCU1g1MDlDQWJ1c2luZXNzLmNydDA5BggrBgEF
+BQcwAoYtaHR0cDovL2NydC50YnMteDUwOS5jb20vVEJTWDUwOUNBYnVzaW5lc3Mu
+Y3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC50YnMteDUwOS5jb20wMwYDVR0R
+BCwwKoIRZWNvbS50YnMteDUwOS5jb22CFXd3dy5lY29tLnRicy14NTA5LmNvbTAN
+BgkqhkiG9w0BAQUFAAOCAQEArT4NHfbY87bGAw8lPV4DmHlmuDuVp/y7ltO3Ynse
+3Rz8RxW2AzuO0Oy2F0Cu4yWKtMyEyMXyHqWtae7ElRbdTu5w5GwVBLJHClCzC8S9
+SpgMMQTx3Rgn8vjkHuU9VZQlulZyiPK7yunjc7c310S9FRZ7XxOwf8Nnx4WnB+No
+WrfApzhhQl31w+RyrNxZe58hCfDDHmevRvwLjQ785ZoQXJDj2j3qAD4aI2yB8lB5
+oaE1jlCJzC7Kmz/Y9jzfmv/zAs1LQTm9ktevv4BTUFaGjv9jxnQ1xnS862ZiouLW
+zZYIlYPf4F6JjXGiIQgQRglILUfq3ftJd9/ok9W9ZF8h8w==
+-----END CERTIFICATE-----
+ 1 s:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA business
+ i:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root
+-----BEGIN CERTIFICATE-----
+MIIFPzCCBCegAwIBAgIQDlBz/++iRSmLDeVRHT/hADANBgkqhkiG9w0BAQUFADBv
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
+ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
+eHRlcm5hbCBDQSBSb290MB4XDTA1MTIwMTAwMDAwMFoXDTE5MDcwOTE4MTkyMlow
+gckxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl
bjEVMBMGA1UEChMMVEJTIElOVEVSTkVUMUgwRgYDVQQLEz9UZXJtcyBhbmQgQ29u
ZGl0aW9uczogaHR0cDovL3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL3JlcG9zaXRv
-cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEYMBYGA1UEAxMPVEJTIFg1MDkg
-Q0EgU0dDMB4XDTEwMDIxODAwMDAwMFoXDTEyMDIxOTIzNTk1OVowgcsxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQREwUxNDAwMDERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNV
-BAcTBENBRU4xGzAZBgNVBAkTEjIyIHJ1ZSBkZSBCcmV0YWduZTEVMBMGA1UEChMM
-VEJTIElOVEVSTkVUMRcwFQYDVQQLEw4wMDAyIDQ0MDQ0MzgxMDEbMBkGA1UECxMS
-c2hhLTI1NiBwcm9kdWN0aW9uMSAwHgYDVQQDExdzaGEyNTYudGJzLWludGVybmV0
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbuM8VT7f0nntwu
-N3F7v9KIBlhKNAxqCrziOXU5iqUt8HrQB3DtHbdmII+CpVUlwlmepsx6G+srEZ9a
-MIGAy0nxi5aLb7watkyIdPjJTMvTUBQ/+RPWzt5JtYbbY9BlJ+yci0dctP74f4NU
-ISLtlrEjUbf2gTohLrcE01TfmOF6PDEbB5PKDi38cB3NzKfizWfrOaJW6Q1C1qOJ
-y4/4jkUREX1UFUIxzx7v62VfjXSGlcjGpBX1fvtABQOSLeE0a6gciDZs1REqroFf
-5eXtqYphpTa14Z83ITXMfgg5Nze1VtMnzI9Qx4blYBw4dgQVEuIsYr7FDBOITDzc
-VEVXZx0CAwEAAaOCAj8wggI7MB8GA1UdIwQYMBaAFAdEdoWTKLx/bXjSCuv6TEvf
-2YIfMB0GA1UdDgQWBBSJKI/AYVI9RQNY0QPIqc8ej2QivTAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEFBQcDAQYIKwYBBQUHAwIG
-CisGAQQBgjcKAwMGCWCGSAGG+EIEATBMBgNVHSAERTBDMEEGCysGAQQBgOU3AgQB
-MDIwMAYIKwYBBQUHAgEWJGh0dHBzOi8vd3d3LnRicy1pbnRlcm5ldC5jb20vQ0Ev
-Q1BTNDBtBgNVHR8EZjBkMDKgMKAuhixodHRwOi8vY3JsLnRicy1pbnRlcm5ldC5j
-b20vVEJTWDUwOUNBU0dDLmNybDAuoCygKoYoaHR0cDovL2NybC50YnMteDUwOS5j
-b20vVEJTWDUwOUNBU0dDLmNybDCBpgYIKwYBBQUHAQEEgZkwgZYwOAYIKwYBBQUH
-MAKGLGh0dHA6Ly9jcnQudGJzLWludGVybmV0LmNvbS9UQlNYNTA5Q0FTR0MuY3J0
-MDQGCCsGAQUFBzAChihodHRwOi8vY3J0LnRicy14NTA5LmNvbS9UQlNYNTA5Q0FT
-R0MuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC50YnMteDUwOS5jb20wPwYD
-VR0RBDgwNoIXc2hhMjU2LnRicy1pbnRlcm5ldC5jb22CG3d3dy5zaGEyNTYudGJz
-LWludGVybmV0LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAA5NL0D4QSqhErhlkdPmz
-XtiMvdGL+ZehM4coTRIpasM/Agt36Rc0NzCvnQwKE+wkngg1Gy2qe7Q0E/ziqBtB
-fZYzdVgu1zdiL4kTaf+wFKYAFGsFbyeEmXysy+CMwaNoF2vpSjCU1UD56bEnTX/W
-fxVZYxtBQUpnu2wOsm8cDZuZRv9XrYgAhGj9Tt6F0aVHSDGn59uwShG1+BVF/uju
-SCyPTTjL1oc7YElJUzR/x4mQJYvtQI8gDIDAGEOs7v3R/gKa5EMfbUQUI4C84UbI
-Yz09Jdnws/MkC/Hm1BZEqk89u7Hvfv+oHqEb0XaUo0TDfsxE0M1sMdnLb91QNQBm
-UQ==
------END CERTIFICATE-----
- 1 s:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA SGC
- i:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQXpDZ0ETJMV02WTx3GTnhhTANBgkqhkiG9w0BAQUFADBv
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-eHRlcm5hbCBDQSBSb290MB4XDTA1MTIwMTAwMDAwMFoXDTE5MDYyNDE5MDYzMFow
-gcQxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl
-bjEVMBMGA1UEChMMVEJTIElOVEVSTkVUMUgwRgYDVQQLEz9UZXJtcyBhbmQgQ29u
-ZGl0aW9uczogaHR0cDovL3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL3JlcG9zaXRv
-cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEYMBYGA1UEAxMPVEJTIFg1MDkg
-Q0EgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsgOkO3f7wzN6
-rOjg45tR5vjBfzK7qmV9IBxb/QW9EEXxG+E7FNhZqQLtwGBKoSsHTnQqV75wWMk0
-9tinWvftBkSpj5sTi/8cbzJfUvTSVYh3Qxv6AVVjMMH/ruLjE6y+4PoaPs8WoYAQ
-ts5R4Z1g8c/WnTepLst2x0/Wv7GmuoQi+gXvHU6YrBiu7XkeYhzc95QdviWSJRDk
-owhb5K43qhcvjRmBfO/paGlCliDGZp8mHwrI21mwobWpVjTxZRwYO3bd4+TGcI4G
-Ie5wmHwE8F7SK1tgSqbBacKjDa93j7txKkfz/Yd2n7TGqOXiHPsJpG655vrKtnXk
-9vs1zoDeJQIDAQABo4IBljCCAZIwHQYDVR0OBBYEFAdEdoWTKLx/bXjSCuv6TEvf
-2YIfMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMCAGA1UdJQQZ
-MBcGCisGAQQBgjcKAwMGCWCGSAGG+EIEATAYBgNVHSAEETAPMA0GCysGAQQBgOU3
-AgQBMHsGA1UdHwR0MHIwOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0Fk
-ZFRydXN0RXh0ZXJuYWxDQVJvb3QuY3JsMDagNKAyhjBodHRwOi8vY3JsLmNvbW9k
-by5uZXQvQWRkVHJ1c3RFeHRlcm5hbENBUm9vdC5jcmwwgYAGCCsGAQUFBwEBBHQw
-cjA4BggrBgEFBQcwAoYsaHR0cDovL2NydC5jb21vZG9jYS5jb20vQWRkVHJ1c3RV
-VE5TR0NDQS5jcnQwNgYIKwYBBQUHMAKGKmh0dHA6Ly9jcnQuY29tb2RvLm5ldC9B
-ZGRUcnVzdFVUTlNHQ0NBLmNydDARBglghkgBhvhCAQEEBAMCAgQwDQYJKoZIhvcN
-AQEFBQADggEBAK2zEzs+jcIrVK9oDkdDZNvhuBYTdCfpxfFs+OAujW0bIfJAy232
-euVsnJm6u/+OrqKudD2tad2BbejLLXhMZViaCmK7D9nrXHx4te5EP8rL19SUVqLY
-1pTnv5dhNgEgvA7n5lIzDSYs7yRLsr7HJsYPr6SeYSuZizyX1SNz7ooJ32/F3X98
-RB0Mlc/E0OyOrkQ9/y5IrnpnaSora8CnUrV5XNOg+kyCz9edCyx4D5wXYcwZPVWz
-8aDqquESrezPyjtfi4WRO4s/VD3HLZvOxzMrWAVYCDG9FxaOhF0QGuuG1F7F3GKV
-v6prNyCl016kRl2j1UT+a7gLd8fA25A4C9E=
+cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEdMBsGA1UEAxMUVEJTIFg1MDkg
+Q0EgYnVzaW5lc3MwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB1PAU
+qudCcz3tmyGcf+u6EkZqonKKHrV4gZYbvVkIRojmmlhfi/jwvpHvo8bqSt/9Rj5S
+jhCDW0pcbI+IPPtD1Jy+CHNSfnMqVDy6CKQ3p5maTzCMG6ZT+XjnvcND5v+FtaiB
+xk1iCX6uvt0jeUtdZvYbyytsSDE6c3Y5//wRxOF8tM1JxibwO3pyER26jbbN2gQz
+m/EkdGjLdJ4svPk23WDAvQ6G0/z2LcAaJB+XLfqRwfQpHQvfKa1uTi8PivC8qtip
+rmNQMMPMjxSK2azX8cKjjTDJiUKaCb4VHlJDWKEsCFRpgJAoAuX8f7Yfs1M4esGo
+sWb3PGspK3O22uIlAgMBAAGjggF6MIIBdjAdBgNVHQ4EFgQUGgkEzPkJj7seoM7U
+pBR/S9UjWM0wDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQAwGAYD
+VR0gBBEwDzANBgsrBgEEAYDlNwIBATB7BgNVHR8EdDByMDigNqA0hjJodHRwOi8v
+Y3JsLmNvbW9kb2NhLmNvbS9BZGRUcnVzdEV4dGVybmFsQ0FSb290LmNybDA2oDSg
+MoYwaHR0cDovL2NybC5jb21vZG8ubmV0L0FkZFRydXN0RXh0ZXJuYWxDQVJvb3Qu
+Y3JsMIGGBggrBgEFBQcBAQR6MHgwOwYIKwYBBQUHMAKGL2h0dHA6Ly9jcnQuY29t
+b2RvY2EuY29tL0FkZFRydXN0VVROU2VydmVyQ0EuY3J0MDkGCCsGAQUFBzAChi1o
+dHRwOi8vY3J0LmNvbW9kby5uZXQvQWRkVHJ1c3RVVE5TZXJ2ZXJDQS5jcnQwEQYJ
+YIZIAYb4QgEBBAQDAgIEMA0GCSqGSIb3DQEBBQUAA4IBAQA7mqrMgk/MrE6QnbNA
+h4nRCn2ti4bg4w2C3lB6bSvRPnYwuNw9Jb8vuKkNFzRDxNJXqVDZdfFW5CVQJuyd
+nfAx83+wk+spzvFaE1KhFYfN9G9pQfXUfvDRoIcJgPEKUXL1wRiOG+IjU3VVI8pg
+IgqHkr7ylln5i5zCiFAPuIJmYUSFg/gxH5xkCNcjJqqrHrHatJr6Qrrke93joupw
+oU1njfAcZtYp6fbiK6u2b1pJqwkVBE8RsfLnPhRj+SFbpvjv8Od7o/ieJhFIYQNU
+k2jX2u8qZnAiNw93LZW9lpYjtuvMXq8QQppENNja5b53q7UwI+lU7ZGjZ7quuESp
+J6/5
-----END CERTIFICATE-----
2 s:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root
- i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC
+ i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN-USERFirst-Hardware
-----BEGIN CERTIFICATE-----
-MIIEZjCCA06gAwIBAgIQUSYKkxzif5zDpV954HKugjANBgkqhkiG9w0BAQUFADCB
-kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+MIIETzCCAzegAwIBAgIQHM5EYpUZep1jUvnyI6m2mDANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
-IFNHQzAeFw0wNTA2MDcwODA5MTBaFw0xOTA2MjQxOTA2MzBaMG8xCzAJBgNVBAYT
-AlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0
-ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC39xoz5vIABC05
-4E5b7R+8bA/Ntfojts7emxEzl6QpTH2Tn71KvJPtAxrjj8/lbVBa1pcplFqAsEl6
-2y6V/bjKvzc4LR4+kUGtcFbH8E8/6DKedMrIkFTpxl8PeJ2aQDwOrGGqXhSPnoeh
-alDc15pOrwWzpnGUnHGzUGAKxxOdOAeGAqjpqGkmGJCrTLBPI6s6T4TY386f4Wlv
-u9dC12tE5Met7m1BX3JacQg3s3llpFmglDf3AC8NwpJy2tA4ctsUqEXEXSp9t7TW
-xO6szRNEt8kr3UMAJfphuWlqWCMRt6czj1Z1WfXNKddGtworZbbTQm8Vsrh7++/p
-XVPVNFonAgMBAAGjgdgwgdUwHwYDVR0jBBgwFoAUUzLRs89/+uDxoF2FTpLSnkUd
-tE8wHQYDVR0OBBYEFK29mHo0tCb3+sQmVO8DveAky1QaMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MBEGCWCGSAGG+EIBAQQEAwIBAjAgBgNVHSUEGTAX
-BgorBgEEAYI3CgMDBglghkgBhvhCBAEwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDov
-L2NybC51c2VydHJ1c3QuY29tL1VUTi1EQVRBQ29ycFNHQy5jcmwwDQYJKoZIhvcN
-AQEFBQADggEBAMbuUxdoFLJRIh6QWA2U/b3xcOWGLcM2MY9USEbnLQg3vGwKYOEO
-rVE04BKT6b64q7gmtOmWPSiPrmQH/uAB7MXjkesYoPF1ftsK5p+R26+udd8jkWjd
-FwBaS/9kbHDrARrQkNnHptZt9hPk/7XJ0h4qy7ElQyZ42TCbTg0evmnv3+r+LbPM
-+bDdtRTKkdSytaX7ARmjR3mfnYyVhzT4HziS2jamEfpr62vp3EV4FTkG101B5CHI
-3C+H0be/SGB1pWLLJN47YaApIKa+xWycxOkKaSLvkTr6Jq/RW0GnOuL4OAdCq8Fb
-+M5tug8EPzI0rNwEKNdwMBQmBsTkm5jVz3g=
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNMDUwNjA3MDgwOTEwWhcNMTkwNzA5MTgxOTIyWjBvMQswCQYD
+VQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0
+IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5h
+bCBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt/caM+by
+AAQtOeBOW+0fvGwPzbX6I7bO3psRM5ekKUx9k5+9SryT7QMa44/P5W1QWtaXKZRa
+gLBJetsulf24yr83OC0ePpFBrXBWx/BPP+gynnTKyJBU6cZfD3idmkA8Dqxhql4U
+j56HoWpQ3NeaTq8Fs6ZxlJxxs1BgCscTnTgHhgKo6ahpJhiQq0ywTyOrOk+E2N/O
+n+Fpb7vXQtdrROTHre5tQV9yWnEIN7N5ZaRZoJQ39wAvDcKSctrQOHLbFKhFxF0q
+fbe01sTurM0TRLfJK91DACX6YblpalgjEbenM49WdVn1zSnXRrcKK2W200JvFbK4
+e/vv6V1T1TRaJwIDAQABo4G9MIG6MB8GA1UdIwQYMBaAFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMB0GA1UdDgQWBBStvZh6NLQm9/rEJlTvA73gJMtUGjAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAQIwRAYDVR0f
+BD0wOzA5oDegNYYzaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmly
+c3QtSGFyZHdhcmUuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQByQhANOs4kClrwF8BW
+onvUOGCSjRK52zYZgDXYNjDtmr5rJ6NyPFDNn+JxkLpjYetIFMTbSRe679Bt8m7a
+gIAoQYFQtxMuyLnJegB2aEbQiIxh/tC21UcFF7ktdnDoTlA6w3pLuvunaI84Of3o
+2YBrhzkTbCfaYk5JRlTpudW9DkUkHBsyx3nknPKnplkIGaK0jgn8E0n+SFabYaHk
+I9LroYT/+JtLefh9lgBdAgVv0UPbzoGfuDsrk/Zh+UrgbLFpHoVnElhzbkh64Z0X
+OGaJunQc68cCZu5HTn/aK7fBGMcVflRCXLVEQpU9PIAdGA8Ynvg684t8GMaKsRl1
+jIGZ
-----END CERTIFICATE-----
- 3 s:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC
- i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC
+ 3 s:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN-USERFirst-Hardware
+ i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN-USERFirst-Hardware
-----BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
-kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
-IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
-EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
-VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
-dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
-E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
-D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
-4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
-lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
-bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
-o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
-MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
-LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
-AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
-j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
-KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
-2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
-mfnGV/TJVTl4uix5yaaIK/QI
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
-----END CERTIFICATE-----
diff --git a/lib-python/2.7/test/test_ssl.py b/lib-python/2.7/test/test_ssl.py
--- a/lib-python/2.7/test/test_ssl.py
+++ b/lib-python/2.7/test/test_ssl.py
@@ -111,13 +111,12 @@
if test_support.verbose:
sys.stdout.write("\n" + pprint.pformat(p) + "\n")
self.assertEqual(p['subject'],
- ((('countryName', u'US'),),
- (('stateOrProvinceName', u'Delaware'),),
- (('localityName', u'Wilmington'),),
- (('organizationName', u'Python Software Foundation'),),
- (('organizationalUnitName', u'SSL'),),
- (('commonName', u'somemachine.python.org'),)),
+ ((('countryName', 'XY'),),
+ (('localityName', 'Castle Anthrax'),),
+ (('organizationName', 'Python Software Foundation'),),
+ (('commonName', 'localhost'),))
)
+ self.assertEqual(p['subjectAltName'], (('DNS', 'localhost'),))
# Issue #13034: the subjectAltName in some certificates
# (notably projects.developer.nokia.com:443) wasn't parsed
p = ssl._ssl._test_decode_cert(NOKIACERT)
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_sqlite3.py
+++ b/lib_pypy/_sqlite3.py
@@ -363,9 +363,11 @@
pass
-def connect(database, **kwargs):
- factory = kwargs.get("factory", Connection)
- return factory(database, **kwargs)
+def connect(database, timeout=5.0, detect_types=0, isolation_level="",
+ check_same_thread=True, factory=None, cached_statements=100):
+ factory = Connection if not factory else factory
+ return factory(database, timeout, detect_types, isolation_level,
+ check_same_thread, factory, cached_statements)
def _unicode_text_factory(x):
diff --git a/lib_pypy/_tkinter/tclobj.py b/lib_pypy/_tkinter/tclobj.py
--- a/lib_pypy/_tkinter/tclobj.py
+++ b/lib_pypy/_tkinter/tclobj.py
@@ -28,9 +28,11 @@
return result
elif value.typePtr == typeCache.BooleanType:
- return result
+ return bool(value.internalRep.longValue)
elif value.typePtr == typeCache.ByteArrayType:
- return result
+ size = tkffi.new('int*')
+ data = tklib.Tcl_GetByteArrayFromObj(value, size)
+ return tkffi.buffer(data, size[0])[:]
elif value.typePtr == typeCache.DoubleType:
return value.internalRep.doubleValue
elif value.typePtr == typeCache.IntType:
@@ -50,7 +52,7 @@
result.append(FromObj(app, tcl_elem[0]))
return tuple(result)
elif value.typePtr == typeCache.ProcBodyType:
- return result
+ pass # fall through and return tcl object.
elif value.typePtr == typeCache.StringType:
buf = tklib.Tcl_GetUnicode(value)
length = tklib.Tcl_GetCharLength(value)
diff --git a/lib_pypy/_tkinter/tklib.py b/lib_pypy/_tkinter/tklib.py
--- a/lib_pypy/_tkinter/tklib.py
+++ b/lib_pypy/_tkinter/tklib.py
@@ -72,6 +72,7 @@
int Tcl_GetBoolean(Tcl_Interp* interp, const char* src, int* boolPtr);
char *Tcl_GetString(Tcl_Obj* objPtr);
char *Tcl_GetStringFromObj(Tcl_Obj* objPtr, int* lengthPtr);
+unsigned char *Tcl_GetByteArrayFromObj(Tcl_Obj* objPtr, int* lengthPtr);
Tcl_UniChar *Tcl_GetUnicode(Tcl_Obj* objPtr);
int Tcl_GetCharLength(Tcl_Obj* objPtr);
diff --git a/lib_pypy/numpypy/__init__.py b/lib_pypy/numpypy/__init__.py
--- a/lib_pypy/numpypy/__init__.py
+++ b/lib_pypy/numpypy/__init__.py
@@ -10,8 +10,35 @@
import os
def get_include():
- head, tail = os.path.split(os.path.dirname(os.path.abspath(__file__)))
- return os.path.join(head, '../include')
+ """
+ Return the directory that contains the NumPy \\*.h header files.
+
+ Extension modules that need to compile against NumPy should use this
+ function to locate the appropriate include directory.
+
+ Notes
+ -----
+ When using ``distutils``, for example in ``setup.py``.
+ ::
+
+ import numpy as np
+ ...
+ Extension('extension_name', ...
+ include_dirs=[np.get_include()])
+ ...
+
+ """
+ import numpy
+ if getattr(numpy, 'show_config', None) is None:
+ # running from numpy source directory
+ head, tail = os.path.split(os.path.dirname(os.path.abspath(__file__)))
+ return os.path.join(head, '../include')
+ else:
+ # using installed numpy core headers
+ import numpy.core as core
+ d = os.path.join(os.path.dirname(core.__file__), 'include')
+ return d
+
__all__ = ['__version__', 'get_include']
diff --git a/lib_pypy/numpypy/core/numerictypes.py b/lib_pypy/numpypy/core/numerictypes.py
--- a/lib_pypy/numpypy/core/numerictypes.py
+++ b/lib_pypy/numpypy/core/numerictypes.py
@@ -1,1 +1,75 @@
from _numpypy.numerictypes import *
+import numpypy
+
+def issubclass_(arg1, arg2):
+ """
+ Determine if a class is a subclass of a second class.
+
+ `issubclass_` is equivalent to the Python built-in ``issubclass``,
+ except that it returns False instead of raising a TypeError is one
+ of the arguments is not a class.
+
+ Parameters
+ ----------
+ arg1 : class
+ Input class. True is returned if `arg1` is a subclass of `arg2`.
+ arg2 : class or tuple of classes.
+ Input class. If a tuple of classes, True is returned if `arg1` is a
+ subclass of any of the tuple elements.
+
+ Returns
+ -------
+ out : bool
+ Whether `arg1` is a subclass of `arg2` or not.
+
+ See Also
+ --------
+ issubsctype, issubdtype, issctype
+
+ Examples
+ --------
+ >>> np.issubclass_(np.int32, np.int)
+ True
+ >>> np.issubclass_(np.int32, np.float)
+ False
+
+ """
+ try:
+ return issubclass(arg1, arg2)
+ except TypeError:
+ return False
+
+def issubdtype(arg1, arg2):
+ """
+ Returns True if first argument is a typecode lower/equal in type hierarchy.
+
+ Parameters
+ ----------
+ arg1, arg2 : dtype_like
+ dtype or string representing a typecode.
+
+ Returns
+ -------
+ out : bool
+
+ See Also
+ --------
+ issubsctype, issubclass_
+ numpy.core.numerictypes : Overview of numpy type hierarchy.
+
+ Examples
+ --------
+ >>> np.issubdtype('S1', str)
+ True
+ >>> np.issubdtype(np.float64, np.float32)
+ False
+
+ """
+ if issubclass_(arg2, generic):
+ return issubclass(numpypy.dtype(arg1).type, arg2)
+ mro = numpypy.dtype(arg2).type.mro()
+ if len(mro) > 1:
+ val = mro[1]
+ else:
+ val = mro[0]
+ return issubclass(numpypy.dtype(arg1).type, val)
diff --git a/pypy/TODO b/pypy/TODO
deleted file mode 100644
--- a/pypy/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-
-* ARM
diff --git a/pypy/doc/arm.rst b/pypy/doc/arm.rst
--- a/pypy/doc/arm.rst
+++ b/pypy/doc/arm.rst
@@ -35,6 +35,11 @@
* ``qemu-system``
* ``qemu-user-static``
+- The dependencies above are in addition to the ones needed for a regular
+ translation, `listed here`_.
+
+.. _`listed here`: getting-started-python.html#translating-the-pypy-python-interpreter
+
Creating a Qemu based ARM chroot
--------------------------------
diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -25,6 +25,7 @@
necessary; also update the version number in pypy/doc/conf.py,
and in pypy/doc/index.rst
* update pypy/doc/contributor.rst (and possibly LICENSE)
+ pypy/doc/tool/makecontributor.py generates the list of contributors
* rename pypy/doc/whatsnew_head.rst to whatsnew_VERSION.rst
and create a fresh whatsnew_head.rst after the release
* update README
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -52,6 +52,10 @@
.. branch: ndarray-subtype
Allow subclassing ndarray, i.e. matrix
+.. branch: pypy-pyarray
+Implement much of numpy's c api in cpyext, allows (slow) access to ndarray
+from c
+
.. branch: kill-ootype
.. branch: fast-slowpath
@@ -97,3 +101,5 @@
Use subclasses of SpaceOperation instead of SpaceOperator objects.
Random cleanups in flowspace.
+.. branch: file-support-in-rpython
+make open() and friends rpython
diff --git a/pypy/interpreter/eval.py b/pypy/interpreter/eval.py
--- a/pypy/interpreter/eval.py
+++ b/pypy/interpreter/eval.py
@@ -107,9 +107,15 @@
for i in range(min(len(varnames), self.getfastscopelength())):
name = varnames[i]
w_value = fastscope_w[i]
+ w_name = self.space.wrap(name)
if w_value is not None:
- w_name = self.space.wrap(name)
self.space.setitem(self.w_locals, w_name, w_value)
+ else:
+ try:
+ self.space.delitem(self.w_locals, w_name)
+ except OperationError as e:
+ if not e.match(self.space, self.space.w_KeyError):
+ raise
def locals2fast(self):
# Copy values from self.w_locals to the fastlocals
diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -954,6 +954,8 @@
sys.path.append(self.goal_dir)
# make sure cwd does not contain a stdlib
+ if self.tmp_dir.startswith(self.trunkdir):
+ skip('TMPDIR is inside the PyPy source')
os.chdir(self.tmp_dir)
tmp_pypy_c = os.path.join(self.tmp_dir, 'pypy-c')
try:
diff --git a/pypy/module/__builtin__/test/test_builtin.py b/pypy/module/__builtin__/test/test_builtin.py
--- a/pypy/module/__builtin__/test/test_builtin.py
+++ b/pypy/module/__builtin__/test/test_builtin.py
@@ -83,10 +83,21 @@
def test_locals(self):
def f():
return locals()
+
def g(c=0, b=0, a=0):
return locals()
+
assert f() == {}
- assert g() == {'a':0, 'b':0, 'c':0}
+ assert g() == {'a': 0, 'b': 0, 'c': 0}
+
+ def test_locals_deleted_local(self):
+ def f():
+ a = 3
+ locals()
+ del a
+ return locals()
+
+ assert f() == {}
def test_dir(self):
def f():
@@ -252,25 +263,9 @@
assert next(x) == 3
def test_xrange_args(self):
-## # xrange() attributes are deprecated and were removed in Python 2.3.
-## x = xrange(2)
-## assert x.start == 0
-## assert x.stop == 2
-## assert x.step == 1
-
-## x = xrange(2,10,2)
-## assert x.start == 2
-## assert x.stop == 10
-## assert x.step == 2
-
-## x = xrange(2.3, 10.5, 2.4)
-## assert x.start == 2
-## assert x.stop == 10
-## assert x.step == 2
-
raises(ValueError, xrange, 0, 1, 0)
- def test_xrange_repr(self):
+ def test_xrange_repr(self):
assert repr(xrange(1)) == 'xrange(1)'
assert repr(xrange(1,2)) == 'xrange(1, 2)'
assert repr(xrange(1,2,3)) == 'xrange(1, 4, 3)'
@@ -329,7 +324,7 @@
raises(TypeError, xrange, 1, 3+2j)
raises(TypeError, xrange, 1, 2, '1')
raises(TypeError, xrange, 1, 2, 3+2j)
-
+
def test_sorted(self):
l = []
sorted_l = sorted(l)
@@ -348,7 +343,7 @@
assert sorted_l is not l
assert sorted_l == ['C', 'b', 'a']
raises(TypeError, sorted, [], reverse=None)
-
+
def test_reversed_simple_sequences(self):
l = range(5)
rev = reversed(l)
@@ -364,8 +359,8 @@
return 42
obj = SomeClass()
assert reversed(obj) == 42
-
-
+
+
def test_cmp(self):
assert cmp(9,9) == 0
assert cmp(0,9) < 0
@@ -398,7 +393,7 @@
raises(RuntimeError, cmp, a, c)
# okay, now break the cycles
a.pop(); b.pop(); c.pop()
-
+
def test_coerce(self):
assert coerce(1, 2) == (1, 2)
assert coerce(1L, 2L) == (1L, 2L)
@@ -465,7 +460,7 @@
assert eval("1+2") == 3
assert eval(" \t1+2\n") == 3
assert eval("len([])") == 0
- assert eval("len([])", {}) == 0
+ assert eval("len([])", {}) == 0
# cpython 2.4 allows this (raises in 2.3)
assert eval("3", None, None) == 3
i = 4
@@ -683,15 +678,15 @@
w_value = space.getitem(w_dict, space.wrap('i'))
assert space.eq_w(w_value, space.wrap(42))
- def test_execfile_different_lineendings(self, space):
+ def test_execfile_different_lineendings(self, space):
from rpython.tool.udir import udir
d = udir.ensure('lineending', dir=1)
- dos = d.join('dos.py')
- f = dos.open('wb')
+ dos = d.join('dos.py')
+ f = dos.open('wb')
f.write("x=3\r\n\r\ny=4\r\n")
- f.close()
+ f.close()
space.appexec([space.wrap(str(dos))], """
- (filename):
+ (filename):
d = {}
execfile(filename, d)
assert d['x'] == 3
@@ -699,12 +694,12 @@
""")
unix = d.join('unix.py')
- f = unix.open('wb')
+ f = unix.open('wb')
f.write("x=5\n\ny=6\n")
- f.close()
+ f.close()
space.appexec([space.wrap(str(unix))], """
- (filename):
+ (filename):
d = {}
execfile(filename, d)
assert d['x'] == 5
diff --git a/pypy/module/_pypyjson/test/test__pypyjson.py b/pypy/module/_pypyjson/test/test__pypyjson.py
--- a/pypy/module/_pypyjson/test/test__pypyjson.py
+++ b/pypy/module/_pypyjson/test/test__pypyjson.py
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
-import py
+import py, sys
from pypy.module._pypyjson.interp_decoder import JSONDecoder
def test_skip_whitespace():
@@ -16,6 +16,9 @@
class AppTest(object):
spaceconfig = {"objspace.usemodules._pypyjson": True}
+ def setup_class(cls):
+ cls.w_run_on_16bit = cls.space.wrap(sys.maxunicode == 65535)
+
def test_raise_on_unicode(self):
import _pypyjson
raises(TypeError, _pypyjson.loads, u"42")
@@ -178,11 +181,11 @@
raises(ValueError, "_pypyjson.loads('[1: 2]')")
raises(ValueError, "_pypyjson.loads('[1, 2')")
raises(ValueError, """_pypyjson.loads('["extra comma",]')""")
-
+
def test_unicode_surrogate_pair(self):
+ if self.run_on_16bit:
+ skip("XXX fix me or mark definitely skipped")
import _pypyjson
expected = u'z\U0001d120x'
res = _pypyjson.loads('"z\\ud834\\udd20x"')
assert res == expected
-
-
diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
--- a/pypy/module/_socket/test/test_sock_app.py
+++ b/pypy/module/_socket/test/test_sock_app.py
@@ -400,6 +400,8 @@
def test_socket_connect_ex(self):
import _socket
s = _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM, 0)
+ # The following might fail if the DNS redirects failed requests to a
+ # catch-all address (i.e. opendns).
# Make sure we get an app-level error, not an interp one.
raises(_socket.gaierror, s.connect_ex, ("wrong.invalid", 80))
s.close()
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -399,7 +399,7 @@
proto = libssl_SSL_CIPHER_get_version(current)
if proto:
- w_proto = space.wrap(rffi.charp2str(name))
+ w_proto = space.wrap(rffi.charp2str(proto))
else:
w_proto = space.w_None
@@ -476,15 +476,15 @@
w_serial = space.wrap(rffi.charpsize2str(buf, length))
space.setitem(w_retval, space.wrap("serialNumber"), w_serial)
- libssl_BIO_reset(biobuf)
- notBefore = libssl_X509_get_notBefore(certificate)
- libssl_ASN1_TIME_print(biobuf, notBefore)
- with lltype.scoped_alloc(rffi.CCHARP.TO, 100) as buf:
- length = libssl_BIO_gets(biobuf, buf, 99)
- if length < 0:
- raise _ssl_seterror(space, None, length)
- w_date = space.wrap(rffi.charpsize2str(buf, length))
- space.setitem(w_retval, space.wrap("notBefore"), w_date)
+ libssl_BIO_reset(biobuf)
+ notBefore = libssl_X509_get_notBefore(certificate)
+ libssl_ASN1_TIME_print(biobuf, notBefore)
+ with lltype.scoped_alloc(rffi.CCHARP.TO, 100) as buf:
+ length = libssl_BIO_gets(biobuf, buf, 99)
+ if length < 0:
+ raise _ssl_seterror(space, None, length)
+ w_date = space.wrap(rffi.charpsize2str(buf, length))
+ space.setitem(w_retval, space.wrap("notBefore"), w_date)
libssl_BIO_reset(biobuf)
notAfter = libssl_X509_get_notAfter(certificate)
@@ -733,7 +733,6 @@
# Set both the read and write BIO's to non-blocking mode
libssl_BIO_set_nbio(libssl_SSL_get_rbio(ss.ssl), 1)
libssl_BIO_set_nbio(libssl_SSL_get_wbio(ss.ssl), 1)
- libssl_SSL_set_connect_state(ss.ssl)
if side == PY_SSL_CLIENT:
libssl_SSL_set_connect_state(ss.ssl)
diff --git a/pypy/module/cpyext/ndarrayobject.py b/pypy/module/cpyext/ndarrayobject.py
--- a/pypy/module/cpyext/ndarrayobject.py
+++ b/pypy/module/cpyext/ndarrayobject.py
@@ -4,11 +4,11 @@
"""
from pypy.interpreter.error import OperationError
-from rpython.rtyper.lltypesystem import rffi
+from rpython.rtyper.lltypesystem import rffi, lltype
from pypy.module.cpyext.api import cpython_api, Py_ssize_t, CANNOT_FAIL
-from pypy.module.cpyext.pyobject import PyObject
-from pypy.module.micronumpy.interp_numarray import W_NDimArray, convert_to_array, wrap_impl
-from pypy.module.micronumpy.interp_dtype import get_dtype_cache
+from pypy.module.cpyext.api import PyObject
+from pypy.module.micronumpy.interp_numarray import W_NDimArray, array
+from pypy.module.micronumpy.interp_dtype import get_dtype_cache, W_Dtype
from pypy.module.micronumpy.arrayimpl.concrete import ConcreteArray
from pypy.module.micronumpy.arrayimpl.scalar import Scalar
from rpython.rlib.rawstorage import RAW_STORAGE_PTR
@@ -113,10 +113,12 @@
assert isinstance(w_array, W_NDimArray)
return rffi.cast(rffi.VOIDP, w_array.implementation.storage)
+PyArray_Descr = PyObject
+NULL = lltype.nullptr(rffi.VOIDP.TO)
- at cpython_api([PyObject, rffi.VOIDP, Py_ssize_t, Py_ssize_t, Py_ssize_t, rffi.VOIDP],
+ at cpython_api([PyObject, PyArray_Descr, Py_ssize_t, Py_ssize_t, Py_ssize_t, rffi.VOIDP],
PyObject)
-def _PyArray_FromAny(space, w_obj, dtype, min_depth, max_depth, requirements, context):
+def _PyArray_FromAny(space, w_obj, w_dtype, min_depth, max_depth, requirements, context):
""" This is the main function used to obtain an array from any nested
sequence, or object that exposes the array interface, op. The
parameters allow specification of the required dtype, the
@@ -147,17 +149,17 @@
only used if the array is constructed that way. Almost always this
parameter is NULL.
"""
- if dtype:
- raise OperationError(space.w_NotImplementedError, space.wrap(
- '_PyArray_FromAny called with not-implemented dtype argument'))
- if min_depth !=0 or max_depth != 0:
- raise OperationError(space.w_NotImplementedError, space.wrap(
- '_PyArray_FromAny called with not-implemented min_dpeth or max_depth argument'))
if requirements not in (0, NPY_DEFAULT):
raise OperationError(space.w_NotImplementedError, space.wrap(
'_PyArray_FromAny called with not-implemented requirements argument'))
- w_array = convert_to_array(space, w_obj)
- if w_array.is_scalar():
+ w_array = array(space, w_obj, w_dtype=w_dtype, copy=False)
+ if min_depth !=0 and len(w_array.get_shape()) < min_depth:
+ raise OperationError(space.w_ValueError, space.wrap(
+ 'object of too small depth for desired array'))
+ elif max_depth !=0 and len(w_array.get_shape()) > max_depth:
+ raise OperationError(space.w_ValueError, space.wrap(
+ 'object of too deep for desired array'))
+ elif w_array.is_scalar():
# since PyArray_DATA() fails on scalars, create a 1D array and set empty
# shape. So the following combination works for *reading* scalars:
# PyObject *arr = PyArray_FromAny(obj);
@@ -171,8 +173,21 @@
@cpython_api([PyObject, Py_ssize_t, Py_ssize_t, Py_ssize_t], PyObject)
def _PyArray_FromObject(space, w_obj, typenum, min_depth, max_depth):
- return _PyArray_FromAny(space, w_obj, typenum, min_depth, max_depth, NPY_BEHAVED);
-
+ try:
+ dtype = get_dtype_cache(space).dtypes_by_num[typenum]
+ except KeyError:
+ raise OperationError(space.w_ValueError, space.wrap(
+ '_PyArray_FromObject called with invalid dtype %d' % typenum))
+ try:
+ return _PyArray_FromAny(space, w_obj, dtype, min_depth, max_depth,
+ 0, NULL);
+ except OperationError, e:
+ if e.match(space, space.w_NotImplementedError):
+ errstr = space.str_w(e.get_w_value(space))
+ errstr = '_PyArray_FromObject' + errstr[16:]
+ raise OperationError(space.w_NotImplementedError, space.wrap(
+ errstr))
+ raise
def get_shape_and_dtype(space, nd, dims, typenum):
shape = []
diff --git a/pypy/module/cpyext/pyerrors.py b/pypy/module/cpyext/pyerrors.py
--- a/pypy/module/cpyext/pyerrors.py
+++ b/pypy/module/cpyext/pyerrors.py
@@ -103,11 +103,13 @@
exc_p[0] = make_ref(space, operr.w_type)
val_p[0] = make_ref(space, operr.get_w_value(space))
- at cpython_api([], lltype.Void)
+ at cpython_api([], rffi.INT_real, error=0)
def PyErr_BadArgument(space):
"""This is a shorthand for PyErr_SetString(PyExc_TypeError, message), where
message indicates that a built-in operation was invoked with an illegal
- argument. It is mostly for internal use."""
+ argument. It is mostly for internal use. In CPython this function always
+ raises an exception and returns 0 in all cases, hence the (ab)use of the
+ error indicator."""
raise OperationError(space.w_TypeError,
space.wrap("bad argument type for built-in operation"))
diff --git a/pypy/module/cpyext/test/test_api.py b/pypy/module/cpyext/test/test_api.py
--- a/pypy/module/cpyext/test/test_api.py
+++ b/pypy/module/cpyext/test/test_api.py
@@ -46,7 +46,7 @@
raise Exception("DID NOT RAISE")
if getattr(space, 'w_' + expected_exc.__name__) is not operror.w_type:
raise Exception("Wrong exception")
- state.clear_exception()
+ return state.clear_exception()
def setup_method(self, func):
freeze_refcnts(self)
diff --git a/pypy/module/cpyext/test/test_ndarrayobject.py b/pypy/module/cpyext/test/test_ndarrayobject.py
--- a/pypy/module/cpyext/test/test_ndarrayobject.py
+++ b/pypy/module/cpyext/test/test_ndarrayobject.py
@@ -90,16 +90,16 @@
def test_FromAny(self, space, api):
a = array(space, [10, 5, 3])
assert api._PyArray_FromAny(a, NULL, 0, 0, 0, NULL) is a
- self.raises(space, api, NotImplementedError, api._PyArray_FromAny,
- space.wrap(a), space.w_None, space.wrap(0),
- space.wrap(3), space.wrap(0), space.w_None)
+ assert api._PyArray_FromAny(a, NULL, 1, 4, 0, NULL) is a
+ self.raises(space, api, ValueError, api._PyArray_FromAny,
+ a, NULL, 4, 5, 0, NULL)
def test_FromObject(self, space, api):
a = array(space, [10, 5, 3])
- assert api._PyArray_FromObject(a, NULL, 0, 0, 0, NULL) is a
- self.raises(space, api, NotImplementedError, api._PyArray_FromObject,
- space.wrap(a), space.w_None, space.wrap(0),
- space.wrap(3), space.wrap(0), space.w_None)
+ assert api._PyArray_FromObject(a, a.get_dtype().num, 0, 0) is a
+ exc = self.raises(space, api, ValueError, api._PyArray_FromObject,
+ a, 11, 4, 5)
+ assert exc.errorstr(space).find('desired') >= 0
def test_list_from_fixedptr(self, space, api):
A = lltype.GcArray(lltype.Float)
@@ -241,6 +241,27 @@
PyObject * obj2 = PyArray_ZEROS(2, dims2, 11, 0);
PyArray_FILLWBYTE(obj2, 42);
PyArray_CopyInto(obj2, obj1);
+ Py_DECREF(obj1);
+ return obj2;
+ '''
+ ),
+ ("test_FromAny", "METH_NOARGS",
+ '''
+ npy_intp dims[2] ={2, 3};
+ PyObject * obj1 = PyArray_SimpleNew(2, dims, 1);
+ PyArray_FILLWBYTE(obj1, 42);
+ PyObject * obj2 = _PyArray_FromAny(obj1, NULL, 0, 0, 0, NULL);
+ Py_DECREF(obj1);
+ return obj2;
+ '''
+ ),
+ ("test_FromObject", "METH_NOARGS",
+ '''
+ npy_intp dims[2] ={2, 3};
+ PyObject * obj1 = PyArray_SimpleNew(2, dims, 1);
+ PyArray_FILLWBYTE(obj1, 42);
+ PyObject * obj2 = _PyArray_FromObject(obj1, 12, 0, 0);
+ Py_DECREF(obj1);
return obj2;
'''
),
@@ -254,3 +275,6 @@
assert (arr == 42).all()
arr = mod.test_copy()
assert (arr == 0).all()
+ #Make sure these work without errors
+ arr = mod.test_FromAny()
+ arr = mod.test_FromObject()
diff --git a/pypy/module/cpyext/test/test_pyerrors.py b/pypy/module/cpyext/test/test_pyerrors.py
--- a/pypy/module/cpyext/test/test_pyerrors.py
+++ b/pypy/module/cpyext/test/test_pyerrors.py
@@ -70,9 +70,10 @@
api.PyErr_Clear()
def test_BadArgument(self, space, api):
- api.PyErr_BadArgument()
+ ret = api.PyErr_BadArgument()
state = space.fromcache(State)
assert space.eq_w(state.operror.w_type, space.w_TypeError)
+ assert ret == 0
api.PyErr_Clear()
def test_Warning(self, space, api, capfd):
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/pypy/module/cpyext/test/test_unicodeobject.py
+++ b/pypy/module/cpyext/test/test_unicodeobject.py
@@ -91,6 +91,7 @@
invalid = rffi.str2charp('invalid')
utf_8 = rffi.str2charp('utf-8')
prev_encoding = rffi.str2charp(space.unwrap(w_default_encoding))
+ self.raises(space, api, TypeError, api.PyUnicode_SetDefaultEncoding, lltype.nullptr(rffi.CCHARP.TO))
assert api.PyUnicode_SetDefaultEncoding(invalid) == -1
assert api.PyErr_Occurred() is space.w_LookupError
api.PyErr_Clear()
@@ -316,6 +317,15 @@
rffi.free_charp(b_text)
rffi.free_charp(b_encoding)
+ def test_decode_null_encoding(self, space, api):
+ null_charp = lltype.nullptr(rffi.CCHARP.TO)
+ u_text = u'abcdefg'
+ s_text = space.str_w(api.PyUnicode_AsEncodedString(space.wrap(u_text), null_charp, null_charp))
+ b_text = rffi.str2charp(s_text)
+ assert space.unwrap(api.PyUnicode_Decode(b_text, len(s_text), null_charp, null_charp)) == u_text
+ self.raises(space, api, TypeError, api.PyUnicode_FromEncodedObject, space.wrap(u_text), null_charp, None)
+ rffi.free_charp(b_text)
+
def test_leak(self):
size = 50
raw_buf, gc_buf = rffi.alloc_buffer(size)
diff --git a/pypy/module/cpyext/unicodeobject.py b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -273,6 +273,8 @@
def PyUnicode_SetDefaultEncoding(space, encoding):
"""Sets the currently active default encoding. Returns 0 on
success, -1 in case of an error."""
+ if not encoding:
+ PyErr_BadArgument(space)
w_encoding = space.wrap(rffi.charp2str(encoding))
setdefaultencoding(space, w_encoding)
default_encoding[0] = '\x00'
@@ -350,8 +352,11 @@
in the unicode() built-in function. The codec to be used is looked up
using the Python codec registry. Return NULL if an exception was raised by
the codec."""
+ if not encoding:
+ # This tracks CPython 2.7, in CPython 3.4 'utf-8' is hardcoded instead
+ encoding = PyUnicode_GetDefaultEncoding(space)
+ w_encoding = space.wrap(rffi.charp2str(encoding))
w_str = space.wrap(rffi.charpsize2str(s, size))
- w_encoding = space.wrap(rffi.charp2str(encoding))
if errors:
w_errors = space.wrap(rffi.charp2str(errors))
else:
@@ -379,6 +384,9 @@
All other objects, including Unicode objects, cause a TypeError to be
set."""
+ if not encoding:
+ raise OperationError(space.w_TypeError,
+ space.wrap("decoding Unicode is not supported"))
w_encoding = space.wrap(rffi.charp2str(encoding))
if errors:
w_errors = space.wrap(rffi.charp2str(errors))
diff --git a/pypy/module/math/interp_math.py b/pypy/module/math/interp_math.py
--- a/pypy/module/math/interp_math.py
+++ b/pypy/module/math/interp_math.py
@@ -334,9 +334,8 @@
v = hi
del partials[added:]
if v != 0.0:
- if rfloat.isinf(v) or rfloat.isnan(v):
- if (not rfloat.isinf(original) and
- not rfloat.isnan(original)):
+ if not rfloat.isfinite(v):
+ if rfloat.isfinite(original):
raise OperationError(space.w_OverflowError,
space.wrap("intermediate overflow"))
if rfloat.isinf(original):
diff --git a/pypy/module/micronumpy/base.py b/pypy/module/micronumpy/base.py
--- a/pypy/module/micronumpy/base.py
+++ b/pypy/module/micronumpy/base.py
@@ -86,7 +86,7 @@
return W_NDimArray(scalar.Scalar(dtype, w_val))
-def convert_to_array(space, w_obj, use_prepare=False):
+def convert_to_array(space, w_obj):
#XXX: This whole routine should very likely simply be array()
from pypy.module.micronumpy.interp_numarray import array
from pypy.module.micronumpy import interp_ufuncs
@@ -101,7 +101,7 @@
if isinstance(w_result, W_NDimArray):
return w_result
else:
- raise OperationError(space.w_ValueError,
+ raise OperationError(space.w_ValueError,
space.wrap("object __array__ method not producing an array"))
elif issequence_w(space, w_obj):
# Convert to array.
diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -357,7 +357,16 @@
elif name == 'logical_or':
self.done_func = done_if_true
else:
- self.done_func = None
+ self.done_func = Non
+
+ def are_common_types(self, dtype1, dtype2):
+ if dtype1.is_complex_type() and dtype2.is_complex_type():
+ return True
+ elif not (dtype1.is_complex_type() or dtype2.is_complex_type()) and \
+ (dtype1.is_int_type() and dtype2.is_int_type() or dtype1.is_float_type() and dtype2.is_float_type()) and \
+ not (dtype1.is_bool_type() or dtype2.is_bool_type()):
+ return True
+ return False
@jit.unroll_safe
def call(self, space, args_w):
diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -2967,6 +2967,17 @@
assert len(list(a[0])) == 2
+ def test_issue_1589(self):
+ import numpypy as numpy
+ c = numpy.array([[(1, 2, 'a'), (3, 4, 'b')], [(5, 6, 'c'), (7, 8, 'd')]],
+ dtype=[('bg', 'i8'), ('fg', 'i8'), ('char', 'S1')])
+ assert c[0][0]["char"] == 'a'
+
+ def test_scalar_coercion(self):
+ import numpypy as np
+ a = np.array([1,2,3], dtype=np.int16)
+ assert (a * 2).dtype == np.int16
+
class AppTestPyPy(BaseNumpyAppTest):
def setup_class(cls):
if option.runappdirect and '__pypy__' not in sys.builtin_module_names:
diff --git a/pypy/module/micronumpy/tool/numready/page.html b/pypy/module/micronumpy/tool/numready/page.html
--- a/pypy/module/micronumpy/tool/numready/page.html
+++ b/pypy/module/micronumpy/tool/numready/page.html
@@ -3,9 +3,11 @@
<head>
<title>NumPyPy Status</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <meta name="description" content="How much of numpy exists in pypy?" >
<style type="text/css">
body {
font-family: 'Consolas', 'Bitstream Vera Sans Mono', monospace;
+ border: 8px
}
h1 {
text-align: center;
@@ -33,8 +35,10 @@
</style>
</head>
<body>
- <h1>NumPyPy Status</h1>
+ <h1>NumPyPy Status: how much of numpy can you use in pypy?</h1>
<h3>Version: {{ ver }}</h3>
+ <h3>numpy compatability test results, generated automatically by running</br>
+ <code>pypy/module/micronumpy/tool/numready/main.py <path-to-latest-pypy></code></h3>
<h3>Overall: {{ msg }}</h3>
<table>
<thead>
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1766,14 +1766,14 @@
def store(self, arr, i, offset, box):
assert isinstance(box, interp_boxes.W_StringBox)
- # XXX simplify to range(box.dtype.get_size()) ?
return self._store(arr.storage, i, offset, box)
@jit.unroll_safe
def _store(self, storage, i, offset, box):
assert isinstance(box, interp_boxes.W_StringBox)
- for k in range(min(self.size, box.arr.size-offset)):
- storage[k + i] = box.arr.storage[k + offset]
+ # XXX simplify to range(box.dtype.get_size()) ?
+ for k in range(min(self.size, box.arr.size-box.ofs)):
+ storage[k + offset + i] = box.arr.storage[k + box.ofs]
def read(self, arr, i, offset, dtype=None):
if dtype is None:
diff --git a/pypy/module/operator/__init__.py b/pypy/module/operator/__init__.py
--- a/pypy/module/operator/__init__.py
+++ b/pypy/module/operator/__init__.py
@@ -50,6 +50,7 @@
'__concat__' : 'concat',
'__contains__' : 'contains',
'sequenceIncludes' : 'contains',
+ '__index__' : 'index',
'__delitem__' : 'delitem',
'__div__' : 'div',
'__eq__' : 'eq',
diff --git a/pypy/module/operator/test/test_operator.py b/pypy/module/operator/test/test_operator.py
--- a/pypy/module/operator/test/test_operator.py
+++ b/pypy/module/operator/test/test_operator.py
@@ -190,3 +190,9 @@
assert methodcaller("method", 4)(x) == (4, 3)
assert methodcaller("method", 4, 5)(x) == (4, 5)
assert methodcaller("method", 4, arg2=42)(x) == (4, 42)
+
+ def test_index(self):
+ import operator
+ assert operator.index(42) == 42
+ assert operator.__index__(42) == 42
+ raises(TypeError, operator.index, "abc")
diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py
--- a/pypy/module/posix/__init__.py
+++ b/pypy/module/posix/__init__.py
@@ -149,6 +149,8 @@
interpleveldefs['nice'] = 'interp_posix.nice'
if hasattr(os, 'getlogin'):
interpleveldefs['getlogin'] = 'interp_posix.getlogin'
+ if hasattr(os, 'ctermid'):
+ interpleveldefs['ctermid'] = 'interp_posix.ctermid'
for name in ['setsid', 'getuid', 'geteuid', 'getgid', 'getegid', 'setuid',
'seteuid', 'setgid', 'setegid', 'getgroups', 'getpgrp',
diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -1218,3 +1218,10 @@
return space.wrap(rurandom.urandom(context, n))
except OSError, e:
raise wrap_oserror(space, e)
+
+def ctermid(space):
+ """ctermid() -> string
+
+ Return the name of the controlling terminal for this process.
+ """
+ return space.wrap(os.ctermid())
diff --git a/pypy/module/pypyjit/policy.py b/pypy/module/pypyjit/policy.py
--- a/pypy/module/pypyjit/policy.py
+++ b/pypy/module/pypyjit/policy.py
@@ -110,7 +110,7 @@
'__pypy__', 'cStringIO', '_collections', 'struct',
'mmap', 'marshal', '_codecs', 'rctime', 'cppyy',
'_cffi_backend', 'pyexpat', '_continuation', '_io',
- 'thread']:
+ 'thread', 'select']:
if modname == 'pypyjit' and 'interp_resop' in rest:
return False
return True
diff --git a/pypy/module/pypyjit/test/test_policy.py b/pypy/module/pypyjit/test/test_policy.py
--- a/pypy/module/pypyjit/test/test_policy.py
+++ b/pypy/module/pypyjit/test/test_policy.py
@@ -49,12 +49,15 @@
from pypy.module.thread.os_lock import Lock
assert pypypolicy.look_inside_function(Lock.descr_lock_acquire.im_func)
+def test_select():
+ from pypy.module.select.interp_select import poll
+ assert pypypolicy.look_inside_function(poll)
+
def test_pypy_module():
from pypy.module._collections.interp_deque import W_Deque
from pypy.module._random.interp_random import W_Random
assert not pypypolicy.look_inside_function(W_Random.random)
assert pypypolicy.look_inside_function(W_Deque.length)
- assert not pypypolicy.look_inside_pypy_module('select.interp_epoll')
assert pypypolicy.look_inside_pypy_module('__builtin__.operation')
assert pypypolicy.look_inside_pypy_module('__builtin__.abstractinst')
assert pypypolicy.look_inside_pypy_module('__builtin__.functional')
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
@@ -277,3 +277,28 @@
f1 = call_release_gil(..., descr=<Calli 4 ii EF=6 OS=62>)
...
""")
+
+ def test__cffi_bug1(self):
+ from rpython.rlib.test.test_clibffi import get_libm_name
+ def main(libm_name):
+ try:
+ import _cffi_backend
+ except ImportError:
+ sys.stderr.write('SKIP: cannot import _cffi_backend\n')
+ return 0
+
+ libm = _cffi_backend.load_library(libm_name)
+ BDouble = _cffi_backend.new_primitive_type("double")
+ BSin = _cffi_backend.new_function_type([BDouble], BDouble)
+ sin = libm.load_function(BSin, 'sin')
+
+ def f(*args):
+ for i in range(300):
+ sin(*args)
+
+ f(1.0)
+ f(1)
+ #
+ libm_name = get_libm_name(sys.platform)
+ log = self.run(main, [libm_name])
+ # assert did not crash
diff --git a/pypy/module/pypyjit/test_pypy_c/test_string.py b/pypy/module/pypyjit/test_pypy_c/test_string.py
--- a/pypy/module/pypyjit/test_pypy_c/test_string.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_string.py
@@ -113,7 +113,7 @@
i13 = strgetitem(p9, 0)
i15 = int_eq(i13, 45)
guard_false(i15, descr=...)
- i17 = int_sub(0, i10)
+ i17 = int_neg(i10)
i19 = int_gt(i10, 23)
guard_false(i19, descr=...)
p21 = newstr(23)
diff --git a/pypy/module/pypyjit/test_pypy_c/test_thread.py b/pypy/module/pypyjit/test_pypy_c/test_thread.py
--- a/pypy/module/pypyjit/test_pypy_c/test_thread.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_thread.py
@@ -60,35 +60,30 @@
assert log.result == main(500)
loop, = log.loops_by_filename(self.filepath)
assert loop.match("""
- i58 = int_gt(i43, 0)
- guard_true(i58, descr=<Guard0x10483adb8>)
- p59 = getfield_gc(p15, descr=<FieldP pypy.module.thread.os_lock.Lock.inst_lock 8>)
- i60 = getfield_gc(p59, descr=<FieldU rpython.rlib.rthread.Lock.inst__lock 8>)
+ i55 = int_gt(i43, 0)
+ guard_true(i55, descr=...)
+ p56 = force_token()
+ setfield_gc(p0, p56, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token .*>)
+ i57 = call_release_gil(..., i36, 1, descr=<Calli 4 ii EF=6>)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
+ i58 = int_is_true(i57)
+ guard_true(i58, descr=...)
+ i59 = int_sub(i43, 1)
+ guard_not_invalidated(descr=...)
p61 = force_token()
- setfield_gc(p0, p61, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token 24>)
- i62 = call_release_gil(4312440032, i60, 1, descr=<Calli 4 ii EF=6>)
- guard_not_forced(descr=<Guard0x103f3cca0>)
- guard_no_exception(descr=<Guard0x10483ad40>)
+ setfield_gc(p0, p61, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token .*>)
+ i62 = call_release_gil(..., i36, 0, descr=<Calli 4 ii EF=6>)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
i63 = int_is_true(i62)
- guard_true(i63, descr=<Guard0x10483acc8>)
- i64 = int_sub(i43, 1)
- guard_not_invalidated(descr=<Guard0x10483ac50>)
- p66 = getfield_gc(p15, descr=<FieldP pypy.module.thread.os_lock.Lock.inst_lock 8>)
- i67 = getfield_gc(p66, descr=<FieldU rpython.rlib.rthread.Lock.inst__lock 8>)
- p68 = force_token()
- setfield_gc(p0, p68, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token 24>)
- i69 = call_release_gil(4312440032, i67, 0, descr=<Calli 4 ii EF=6>)
- guard_not_forced(descr=<Guard0x103f3cc20>)
- guard_no_exception(descr=<Guard0x10483aae8>)
- i70 = int_is_true(i69)
- guard_false(i70, descr=<Guard0x10483aa70>)
- i71 = getfield_gc(p66, descr=<FieldU rpython.rlib.rthread.Lock.inst__lock 8>)
- p72 = force_token()
- setfield_gc(p0, p72, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token 24>)
- call_release_gil(4312441056, i71, descr=<Callv 0 i EF=6>)
- guard_not_forced(descr=<Guard0x103f3cba0>)
- guard_no_exception(descr=<Guard0x10483a9f8>)
- guard_not_invalidated(descr=<Guard0x10483a980>)
+ guard_false(i63, descr=...)
+ p64 = force_token()
+ setfield_gc(p0, p64, descr=<FieldP pypy.interpreter.pyframe.PyFrame.vable_token .*>)
+ call_release_gil(..., i36, descr=<Callv 0 i EF=6>)
+ guard_not_forced(descr=...)
+ guard_no_exception(descr=...)
+ guard_not_invalidated(descr=...)
--TICK--
- jump(..., descr=TargetToken(4361239720))
+ jump(..., descr=...)
""")
diff --git a/pypy/module/select/interp_kqueue.py b/pypy/module/select/interp_kqueue.py
--- a/pypy/module/select/interp_kqueue.py
+++ b/pypy/module/select/interp_kqueue.py
@@ -180,12 +180,12 @@
i = 0
for w_ev in space.listview(w_changelist):
ev = space.interp_w(W_Kevent, w_ev)
- changelist[i].c_ident = ev.event.c_ident
- changelist[i].c_filter = ev.event.c_filter
- changelist[i].c_flags = ev.event.c_flags
- changelist[i].c_fflags = ev.event.c_fflags
- changelist[i].c_data = ev.event.c_data
- changelist[i].c_udata = ev.event.c_udata
+ changelist[i].c_ident = ev.ident
+ changelist[i].c_filter = ev.filter
+ changelist[i].c_flags = ev.flags
+ changelist[i].c_fflags = ev.fflags
+ changelist[i].c_data = ev.data
+ changelist[i].c_udata = ev.udata
i += 1
pchangelist = changelist
else:
@@ -206,13 +206,12 @@
evt = eventlist[i]
w_event = W_Kevent(space)
- w_event.event = lltype.malloc(kevent, flavor="raw")
- w_event.event.c_ident = evt.c_ident
- w_event.event.c_filter = evt.c_filter
- w_event.event.c_flags = evt.c_flags
- w_event.event.c_fflags = evt.c_fflags
- w_event.event.c_data = evt.c_data
- w_event.event.c_udata = evt.c_udata
+ w_event.ident = evt.c_ident
+ w_event.filter = evt.c_filter
+ w_event.flags = evt.c_flags
+ w_event.fflags = evt.c_fflags
+ w_event.data = evt.c_data
+ w_event.udata = evt.c_udata
elist_w[i] = w_event
@@ -234,11 +233,12 @@
class W_Kevent(W_Root):
def __init__(self, space):
- self.event = lltype.nullptr(kevent)
-
- def __del__(self):
- if self.event:
- lltype.free(self.event, flavor="raw")
+ self.ident = rffi.cast(kevent.c_ident, 0)
+ self.filter = rffi.cast(kevent.c_filter, 0)
+ self.flags = rffi.cast(kevent.c_flags, 0)
+ self.fflags = rffi.cast(kevent.c_fflags, 0)
+ self.data = rffi.cast(kevent.c_data, 0)
+ self.udata = lltype.nullptr(rffi.VOIDP.TO)
@unwrap_spec(filter=int, flags='c_uint', fflags='c_uint', data=int, udata=r_uint)
def descr__init__(self, space, w_ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=r_uint(0)):
@@ -247,35 +247,34 @@
else:
ident = r_uint(space.c_filedescriptor_w(w_ident))
- self.event = lltype.malloc(kevent, flavor="raw")
- rffi.setintfield(self.event, "c_ident", ident)
- rffi.setintfield(self.event, "c_filter", filter)
- rffi.setintfield(self.event, "c_flags", flags)
- rffi.setintfield(self.event, "c_fflags", fflags)
- rffi.setintfield(self.event, "c_data", data)
- self.event.c_udata = rffi.cast(rffi.VOIDP, udata)
+ self.ident = rffi.cast(kevent.c_ident, ident)
+ self.filter = rffi.cast(kevent.c_filter, filter)
+ self.flags = rffi.cast(kevent.c_flags, flags)
+ self.fflags = rffi.cast(kevent.c_fflags, fflags)
+ self.data = rffi.cast(kevent.c_data, data)
+ self.udata = rffi.cast(rffi.VOIDP, udata)
def _compare_all_fields(self, other, op):
if IDENT_UINT:
- l_ident = rffi.cast(lltype.Unsigned, self.event.c_ident)
- r_ident = rffi.cast(lltype.Unsigned, other.event.c_ident)
+ l_ident = rffi.cast(lltype.Unsigned, self.ident)
+ r_ident = rffi.cast(lltype.Unsigned, other.ident)
else:
- l_ident = self.event.c_ident
- r_ident = other.event.c_ident
- l_filter = rffi.cast(lltype.Signed, self.event.c_filter)
- r_filter = rffi.cast(lltype.Signed, other.event.c_filter)
- l_flags = rffi.cast(lltype.Unsigned, self.event.c_flags)
- r_flags = rffi.cast(lltype.Unsigned, other.event.c_flags)
- l_fflags = rffi.cast(lltype.Unsigned, self.event.c_fflags)
- r_fflags = rffi.cast(lltype.Unsigned, other.event.c_fflags)
+ l_ident = self.ident
+ r_ident = other.ident
+ l_filter = rffi.cast(lltype.Signed, self.filter)
+ r_filter = rffi.cast(lltype.Signed, other.filter)
+ l_flags = rffi.cast(lltype.Unsigned, self.flags)
+ r_flags = rffi.cast(lltype.Unsigned, other.flags)
+ l_fflags = rffi.cast(lltype.Unsigned, self.fflags)
+ r_fflags = rffi.cast(lltype.Unsigned, other.fflags)
if IDENT_UINT:
- l_data = rffi.cast(lltype.Signed, self.event.c_data)
- r_data = rffi.cast(lltype.Signed, other.event.c_data)
+ l_data = rffi.cast(lltype.Signed, self.data)
+ r_data = rffi.cast(lltype.Signed, other.data)
else:
- l_data = self.event.c_data
- r_data = other.event.c_data
- l_udata = rffi.cast(lltype.Unsigned, self.event.c_udata)
- r_udata = rffi.cast(lltype.Unsigned, other.event.c_udata)
+ l_data = self.data
+ r_data = other.data
+ l_udata = rffi.cast(lltype.Unsigned, self.udata)
+ r_udata = rffi.cast(lltype.Unsigned, other.udata)
if op == "eq":
return l_ident == r_ident and \
@@ -330,22 +329,22 @@
return space.wrap(self.compare_all_fields(space, w_other, "gt"))
def descr_get_ident(self, space):
- return space.wrap(self.event.c_ident)
+ return space.wrap(self.ident)
def descr_get_filter(self, space):
- return space.wrap(self.event.c_filter)
+ return space.wrap(self.filter)
def descr_get_flags(self, space):
- return space.wrap(self.event.c_flags)
+ return space.wrap(self.flags)
def descr_get_fflags(self, space):
- return space.wrap(self.event.c_fflags)
+ return space.wrap(self.fflags)
def descr_get_data(self, space):
- return space.wrap(self.event.c_data)
+ return space.wrap(self.data)
def descr_get_udata(self, space):
- return space.wrap(rffi.cast(rffi.UINTPTR_T, self.event.c_udata))
+ return space.wrap(rffi.cast(rffi.UINTPTR_T, self.udata))
W_Kevent.typedef = TypeDef("select.kevent",
diff --git a/pypy/module/test_lib_pypy/numpypy/test_numpy.py b/pypy/module/test_lib_pypy/numpypy/test_numpy.py
--- a/pypy/module/test_lib_pypy/numpypy/test_numpy.py
+++ b/pypy/module/test_lib_pypy/numpypy/test_numpy.py
@@ -96,10 +96,13 @@
def test___all__(self):
import numpy
- assert '__all__' in numpy
+ assert '__all__' in dir(numpy)
assert 'numpypy' not in dir(numpy)
def test_get_include(self):
+ import sys
+ if not hasattr(sys, 'pypy_translation_info'):
+ skip("pypy white-box test")
import numpy, os
assert 'get_include' in dir(numpy)
path = numpy.get_include()
diff --git a/pypy/module/test_lib_pypy/test_sqlite3.py b/pypy/module/test_lib_pypy/test_sqlite3.py
--- a/pypy/module/test_lib_pypy/test_sqlite3.py
+++ b/pypy/module/test_lib_pypy/test_sqlite3.py
@@ -31,6 +31,12 @@
result = list(cursor)
assert result == [(42,)]
+def test_connect_takes_same_positional_args_as_Connection(con):
+ from inspect import getargspec
+ clsargs = getargspec(_sqlite3.Connection.__init__).args[1:] # ignore self
+ conargs = getargspec(_sqlite3.connect).args
+ assert clsargs == conargs
+
def test_total_changes_after_close(con):
con.close()
pytest.raises(_sqlite3.ProgrammingError, "con.total_changes")
diff --git a/pypy/module/thread/os_lock.py b/pypy/module/thread/os_lock.py
--- a/pypy/module/thread/os_lock.py
+++ b/pypy/module/thread/os_lock.py
@@ -26,6 +26,8 @@
class Lock(W_Root):
"A box around an interp-level lock object."
+ _immutable_fields_ = ["lock"]
+
def __init__(self, space):
self.space = space
try:
diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py
--- a/pypy/objspace/std/floatobject.py
+++ b/pypy/objspace/std/floatobject.py
@@ -424,21 +424,24 @@
x = w_float1.floatval
y = w_float2.floatval
+ return W_FloatObject(_pow(space, x, y))
+
+def _pow(space, x, y):
# Sort out special cases here instead of relying on pow()
- if y == 2.0: # special case for performance:
- return W_FloatObject(x * x) # x * x is always correct
+ if y == 2.0: # special case for performance:
+ return x * x # x * x is always correct
if y == 0.0:
# x**0 is 1, even 0**0
- return W_FloatObject(1.0)
+ return 1.0
if isnan(x):
# nan**y = nan, unless y == 0
- return W_FloatObject(x)
+ return x
if isnan(y):
# x**nan = nan, unless x == 1; x**nan = x
if x == 1.0:
- return W_FloatObject(1.0)
+ return 1.0
else:
- return W_FloatObject(y)
+ return y
if isinf(y):
# x**inf is: 0.0 if abs(x) < 1; 1.0 if abs(x) == 1; inf if
# abs(x) > 1 (including case where x infinite)
@@ -447,11 +450,11 @@
# abs(x) > 1 (including case where v infinite)
x = abs(x)
if x == 1.0:
- return W_FloatObject(1.0)
+ return 1.0
elif (y > 0.0) == (x > 1.0):
- return W_FloatObject(INFINITY)
+ return INFINITY
else:
- return W_FloatObject(0.0)
+ return 0.0
if isinf(x):
# (+-inf)**w is: inf for w positive, 0 for w negative; in oth
# cases, we need to add the appropriate sign if w is an odd
@@ -459,14 +462,14 @@
y_is_odd = math.fmod(abs(y), 2.0) == 1.0
if y > 0.0:
if y_is_odd:
- return W_FloatObject(x)
+ return x
else:
- return W_FloatObject(abs(x))
+ return abs(x)
else:
if y_is_odd:
- return W_FloatObject(copysign(0.0, x))
+ return copysign(0.0, x)
else:
- return W_FloatObject(0.0)
+ return 0.0
if x == 0.0:
if y < 0.0:
@@ -480,7 +483,7 @@
# - pipermail/python-bugs-list/2003-March/016795.html
if x < 0.0:
if isnan(y):
- return W_FloatObject(NAN)
+ return NAN
if math.floor(y) != y:
raise OperationError(space.w_ValueError,
space.wrap("negative number cannot be "
@@ -494,9 +497,9 @@
if x == 1.0:
# (-1) ** large_integer also ends up here
if negate_result:
- return W_FloatObject(-1.0)
+ return -1.0
else:
- return W_FloatObject(1.0)
+ return 1.0
try:
# We delegate to our implementation of math.pow() the error detection.
@@ -510,7 +513,7 @@
if negate_result:
z = -z
- return W_FloatObject(z)
+ return z
def neg__Float(space, w_float1):
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -30,7 +30,7 @@
from rpython.rlib import debug, jit, rerased
from rpython.rlib.listsort import make_timsort_class
from rpython.rlib.objectmodel import (
- instantiate, newlist_hint, resizelist_hint, specialize)
+ instantiate, newlist_hint, resizelist_hint, specialize, import_from_mixin)
from rpython.tool.sourcetools import func_with_new_name
__all__ = ['W_ListObject', 'make_range_list', 'make_empty_list_with_size']
@@ -1170,7 +1170,6 @@
class AbstractUnwrappedStrategy(object):
- _mixin_ = True
def wrap(self, unwrapped):
raise NotImplementedError
@@ -1329,7 +1328,6 @@
def setslice(self, w_list, start, step, slicelength, w_other):
assert slicelength >= 0
- items = self.unerase(w_list.lstorage)
if self is self.space.fromcache(ObjectListStrategy):
w_other = w_other._temporarily_as_objects()
@@ -1341,6 +1339,7 @@
w_list.setslice(start, step, slicelength, w_other_as_object)
return
+ items = self.unerase(w_list.lstorage)
oldsize = len(items)
len2 = w_other.length()
if step == 1: # Support list resizing for non-extended slices
@@ -1456,7 +1455,9 @@
self.unerase(w_list.lstorage).reverse()
-class ObjectListStrategy(AbstractUnwrappedStrategy, ListStrategy):
+class ObjectListStrategy(ListStrategy):
+ import_from_mixin(AbstractUnwrappedStrategy)
+
_none_value = None
_applevel_repr = "object"
@@ -1489,7 +1490,9 @@
return self.unerase(w_list.lstorage)
-class IntegerListStrategy(AbstractUnwrappedStrategy, ListStrategy):
+class IntegerListStrategy(ListStrategy):
+ import_from_mixin(AbstractUnwrappedStrategy)
+
_none_value = 0
_applevel_repr = "int"
@@ -1520,7 +1523,30 @@
return self.unerase(w_list.lstorage)
-class FloatListStrategy(AbstractUnwrappedStrategy, ListStrategy):
+ _base_extend_from_list = _extend_from_list
+
+ def _extend_from_list(self, w_list, w_other):
+ if w_other.strategy is self.space.fromcache(RangeListStrategy):
+ l = self.unerase(w_list.lstorage)
+ other = w_other.getitems_int()
+ assert other is not None
+ l += other
+ return
+ return self._base_extend_from_list(w_list, w_other)
+
+
+ _base_setslice = setslice
+
+ def setslice(self, w_list, start, step, slicelength, w_other):
+ if w_other.strategy is self.space.fromcache(RangeListStrategy):
+ storage = self.erase(w_other.getitems_int())
+ w_other = W_ListObject.from_storage_and_strategy(
+ self.space, storage, self)
+ return self._base_setslice(w_list, start, step, slicelength, w_other)
+
+class FloatListStrategy(ListStrategy):
+ import_from_mixin(AbstractUnwrappedStrategy)
+
_none_value = 0.0
_applevel_repr = "float"
@@ -1548,7 +1574,9 @@
l.reverse()
-class StringListStrategy(AbstractUnwrappedStrategy, ListStrategy):
+class StringListStrategy(ListStrategy):
+ import_from_mixin(AbstractUnwrappedStrategy)
+
_none_value = None
_applevel_repr = "str"
@@ -1579,7 +1607,9 @@
return self.unerase(w_list.lstorage)
-class UnicodeListStrategy(AbstractUnwrappedStrategy, ListStrategy):
+class UnicodeListStrategy(ListStrategy):
+ import_from_mixin(AbstractUnwrappedStrategy)
+
_none_value = None
_applevel_repr = "unicode"
diff --git a/pypy/objspace/std/test/test_boolobject.py b/pypy/objspace/std/test/test_boolobject.py
--- a/pypy/objspace/std/test/test_boolobject.py
+++ b/pypy/objspace/std/test/test_boolobject.py
@@ -44,6 +44,13 @@
def test_bool_int(self):
assert int(True) is 1
assert int(False) is 0
+ # XXX: broken
+ #assert True.__int__() is 1
+
+ def test_bool_long(self):
+ assert long(True) is 1L
+ assert long(False) is 0L
+ assert True.__long__() is 1L
def test_bool_ops(self):
assert True + True == 2
diff --git a/pypy/objspace/std/test/test_liststrategies.py b/pypy/objspace/std/test/test_liststrategies.py
--- a/pypy/objspace/std/test/test_liststrategies.py
+++ b/pypy/objspace/std/test/test_liststrategies.py
@@ -225,6 +225,15 @@
l.setslice(0, 1, 2, W_ListObject(space, [w('a'), w(2), w(3)]))
assert isinstance(l.strategy, ObjectListStrategy)
+ def test_setslice_int_range(self):
+ space = self.space
+ w = space.wrap
+ l = W_ListObject(space, [w(1), w(2), w(3)])
+ assert isinstance(l.strategy, IntegerListStrategy)
+ l.setslice(0, 1, 2, make_range_list(space, 5, 1, 4))
+ assert isinstance(l.strategy, IntegerListStrategy)
+
+
def test_setslice_List(self):
space = self.space
@@ -467,6 +476,12 @@
l4 = W_ListObject(self.space, [self.space.wrap(1), self.space.wrap(2), self.space.wrap(3), self.space.wrap(1), self.space.wrap(2), self.space.wrap(3)])
assert self.space.eq_w(l3, l4)
+ def test_add_of_range_and_int(self):
+ l1 = make_range_list(self.space, 0, 1, 100)
+ l2 = W_ListObject(self.space, [self.space.wrap(1), self.space.wrap(2), self.space.wrap(3)])
+ l3 = self.space.add(l2, l1)
+ assert l3.strategy is l2.strategy
+
def test_mul(self):
l1 = W_ListObject(self.space, [self.space.wrap(1), self.space.wrap(2), self.space.wrap(3)])
l2 = l1.mul(2)
diff --git a/pypy/objspace/std/tupleobject.py b/pypy/objspace/std/tupleobject.py
--- a/pypy/objspace/std/tupleobject.py
+++ b/pypy/objspace/std/tupleobject.py
@@ -197,10 +197,10 @@
W_AbstractTupleObject.typedef = StdTypeDef(
"tuple",
- __doc__ = '''tuple() -> an empty tuple
+ __doc__ = """tuple() -> an empty tuple
tuple(sequence) -> tuple initialized from sequence's items
-If the argument is a tuple, the return value is the same object.''',
+If the argument is a tuple, the return value is the same object.""",
__new__ = interp2app(W_AbstractTupleObject.descr_new),
__repr__ = interp2app(W_AbstractTupleObject.descr_repr),
__hash__ = interpindirect2app(W_AbstractTupleObject.descr_hash),
diff --git a/pypy/pytest-A.py b/pypy/pytest-A.py
--- a/pypy/pytest-A.py
+++ b/pypy/pytest-A.py
@@ -5,7 +5,6 @@
'arm': ['interpreter/astcompiler/test',
'interpreter/pyparser/test',
'interpreter/test',
- 'interpreter/test2',
'module/test_lib_pypy',
'objspace/std/test',
],
diff --git a/rpython/annotator/test/test_annrpython.py b/rpython/annotator/test/test_annrpython.py
--- a/rpython/annotator/test/test_annrpython.py
+++ b/rpython/annotator/test/test_annrpython.py
@@ -3442,6 +3442,29 @@
a.build_types(f, [str])
+ def test_negative_number_find(self):
+ def f(s, e):
+ return "xyz".find("x", s, e)
+
+ a = self.RPythonAnnotator()
+ py.test.raises(annmodel.AnnotatorError, "a.build_types(f, [int, int])")
+ a.build_types(f, [annmodel.SomeInteger(nonneg=True),
+ annmodel.SomeInteger(nonneg=True)])
+ def f(s, e):
+ return "xyz".rfind("x", s, e)
+
+ py.test.raises(annmodel.AnnotatorError, "a.build_types(f, [int, int])")
+ a.build_types(f, [annmodel.SomeInteger(nonneg=True),
+ annmodel.SomeInteger(nonneg=True)])
+
+ def f(s, e):
+ return "xyz".count("x", s, e)
+
+ py.test.raises(annmodel.AnnotatorError, "a.build_types(f, [int, int])")
+ a.build_types(f, [annmodel.SomeInteger(nonneg=True),
+ annmodel.SomeInteger(nonneg=True)])
+
+
def test_setslice(self):
def f():
lst = [2, 5, 7]
@@ -4080,7 +4103,7 @@
with py.test.raises(annmodel.UnionError) as exc:
a.build_types(f, [int])
- assert ("RPython cannot unify instances with no common base class"
+ assert ("RPython cannot unify instances with no common base class"
in exc.value.msg)
def test_unionerror_iters(self):
@@ -4096,7 +4119,7 @@
with py.test.raises(annmodel.UnionError) as exc:
a.build_types(f, [int])
- assert ("RPython cannot unify incompatible iterator variants" in
+ assert ("RPython cannot unify incompatible iterator variants" in
exc.value.msg)
def test_variable_getattr(self):
diff --git a/rpython/annotator/unaryop.py b/rpython/annotator/unaryop.py
--- a/rpython/annotator/unaryop.py
+++ b/rpython/annotator/unaryop.py
@@ -10,7 +10,7 @@
SomeUnicodeCodePoint, SomeInstance, SomeBuiltin, SomeFloat, SomeIterator,
SomePBC, SomeTypedAddressAccess, SomeAddress, SomeType, s_ImpossibleValue,
s_Bool, s_None, unionof, missing_operation, add_knowntypedata,
- HarmlesslyBlocked, SomeWeakRef, SomeUnicodeString)
+ HarmlesslyBlocked, SomeWeakRef, SomeUnicodeString, SomeByteArray)
from rpython.annotator.bookkeeper import getbookkeeper
from rpython.annotator import builtin
from rpython.annotator.binaryop import _clone ## XXX where to put this?
@@ -333,12 +333,13 @@
check_negative_slice(s_start, s_stop)
lst.listdef.resize()
-def check_negative_slice(s_start, s_stop):
+def check_negative_slice(s_start, s_stop, error="slicing"):
if isinstance(s_start, SomeInteger) and not s_start.nonneg:
- raise AnnotatorError("slicing: not proven to have non-negative start")
+ raise AnnotatorError("%s: not proven to have non-negative start" %
+ error)
if isinstance(s_stop, SomeInteger) and not s_stop.nonneg and \
getattr(s_stop, 'const', 0) != -1:
- raise AnnotatorError("slicing: not proven to have non-negative stop")
+ raise AnnotatorError("%s: not proven to have non-negative stop" % error)
class __extend__(SomeDict):
@@ -448,12 +449,15 @@
return s_Bool
def method_find(str, frag, start=None, end=None):
+ check_negative_slice(start, end, "find")
return SomeInteger()
def method_rfind(str, frag, start=None, end=None):
+ check_negative_slice(start, end, "rfind")
return SomeInteger()
def method_count(str, frag, start=None, end=None):
+ check_negative_slice(start, end, "count")
return SomeInteger(nonneg=True)
def method_strip(str, chr):
@@ -520,6 +524,11 @@
op_contains.can_only_throw = []
+class __extend__(SomeByteArray):
+ def getslice(ba, s_start, s_stop):
+ check_negative_slice(s_start, s_stop)
+ return SomeByteArray()
+
class __extend__(SomeUnicodeString):
def method_encode(uni, s_enc):
if not s_enc.is_constant():
diff --git a/rpython/flowspace/model.py b/rpython/flowspace/model.py
--- a/rpython/flowspace/model.py
+++ b/rpython/flowspace/model.py
@@ -252,6 +252,23 @@
from rpython.translator.tool.graphpage import try_show
try_show(self)
+ def get_graph(self):
+ import gc
+ pending = [self] # pending blocks
More information about the pypy-commit
mailing list