Skip to content

Commit bbc681a

Browse files
committed
[GR-13419] Small fixis to run pip installer
PullRequest: graalpython/369
2 parents b32b9a1 + dc7fec6 commit bbc681a

File tree

7 files changed

+270
-4
lines changed

7 files changed

+270
-4
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import com.oracle.graal.python.builtins.modules.MMapModuleBuiltins;
6969
import com.oracle.graal.python.builtins.modules.MarshalModuleBuiltins;
7070
import com.oracle.graal.python.builtins.modules.MathModuleBuiltins;
71+
import com.oracle.graal.python.builtins.modules.OperatorModuleBuiltins;
7172
import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins;
7273
import com.oracle.graal.python.builtins.modules.PosixSubprocessModuleBuiltins;
7374
import com.oracle.graal.python.builtins.modules.PyExpatModuleBuiltins;
@@ -325,6 +326,7 @@ private static final PythonBuiltins[] initializeBuiltins(Env env) {
325326
new ReadlineModuleBuiltins(),
326327
new PyExpatModuleBuiltins(),
327328
new SysConfigModuleBuiltins(),
329+
new OperatorModuleBuiltins(),
328330
new ZipImporterBuiltins(),
329331
new ZipImportModuleBuiltins(),
330332
new ZLibModuleBuiltins(),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
/*
2+
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
42+
package com.oracle.graal.python.builtins.modules;
43+
44+
import com.oracle.graal.python.builtins.Builtin;
45+
import com.oracle.graal.python.builtins.CoreFunctions;
46+
import com.oracle.graal.python.builtins.PythonBuiltins;
47+
import com.oracle.graal.python.builtins.objects.PNone;
48+
import com.oracle.graal.python.builtins.objects.ints.PInt;
49+
import com.oracle.graal.python.nodes.SpecialMethodNames;
50+
import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
51+
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
52+
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
53+
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
54+
import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
55+
import com.oracle.truffle.api.CompilerDirectives;
56+
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
57+
import com.oracle.truffle.api.dsl.Fallback;
58+
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
59+
import com.oracle.truffle.api.dsl.NodeFactory;
60+
import com.oracle.truffle.api.dsl.Specialization;
61+
import com.oracle.truffle.api.dsl.TypeSystemReference;
62+
import java.math.BigInteger;
63+
import java.util.List;
64+
65+
@CoreFunctions(defineModule = OperatorModuleBuiltins.MODULE_NAME)
66+
public class OperatorModuleBuiltins extends PythonBuiltins {
67+
68+
protected static final String MODULE_NAME = "_operator";
69+
70+
@Override
71+
protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
72+
return OperatorModuleBuiltinsFactory.getFactories();
73+
}
74+
75+
@Builtin(name = "truth", fixedNumOfPositionalArgs = 1)
76+
@TypeSystemReference(PythonArithmeticTypes.class)
77+
@GenerateNodeFactory
78+
public abstract static class TruthNode extends PythonUnaryBuiltinNode {
79+
80+
@Specialization
81+
public boolean doBoolean(boolean value) {
82+
return value;
83+
}
84+
85+
@Specialization
86+
public boolean doNone(@SuppressWarnings("unused") PNone value) {
87+
return false;
88+
}
89+
90+
@Specialization
91+
public boolean doInt(long value) {
92+
return value != 0;
93+
}
94+
95+
@Specialization
96+
@TruffleBoundary
97+
public boolean doPInt(PInt value) {
98+
return !value.getValue().equals(BigInteger.ZERO);
99+
}
100+
101+
@Specialization
102+
public boolean doDouble(double value) {
103+
return value != 0;
104+
}
105+
106+
@Specialization
107+
public boolean doString(String value) {
108+
return !value.isEmpty();
109+
}
110+
111+
private @Child LookupAndCallUnaryNode boolNode;
112+
private @Child LookupAndCallUnaryNode lenNode;
113+
114+
@Fallback
115+
public boolean doObject(Object value) {
116+
if (boolNode == null) {
117+
CompilerDirectives.transferToInterpreterAndInvalidate();
118+
boolNode = insert((LookupAndCallUnaryNode.create(SpecialMethodNames.__BOOL__)));
119+
}
120+
Object result = boolNode.executeObject(value);
121+
if (result != PNone.NO_VALUE) {
122+
return (boolean) result;
123+
}
124+
if (lenNode == null) {
125+
CompilerDirectives.transferToInterpreterAndInvalidate();
126+
lenNode = insert((LookupAndCallUnaryNode.create(SpecialMethodNames.__LEN__)));
127+
}
128+
129+
result = lenNode.executeObject(value);
130+
if (result == PNone.NO_VALUE) {
131+
return false;
132+
}
133+
return (int) result != 0;
134+
}
135+
}
136+
137+
// _compare_digest
138+
@Builtin(name = "_compare_digest", fixedNumOfPositionalArgs = 2)
139+
@TypeSystemReference(PythonArithmeticTypes.class)
140+
@GenerateNodeFactory
141+
public abstract static class CompareDigestNode extends PythonBinaryBuiltinNode {
142+
143+
@Specialization
144+
public boolean doString(String arg1, String arg2) {
145+
return arg1.equals(arg2);
146+
}
147+
148+
}
149+
}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SignalModuleBuiltins.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -52,6 +52,7 @@
5252
import com.oracle.graal.python.builtins.objects.ints.PInt;
5353
import com.oracle.graal.python.nodes.argument.CreateArgumentsNode;
5454
import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
55+
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
5556
import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
5657
import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
5758
import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
@@ -132,6 +133,16 @@ Object getsignal(int signum) {
132133
}
133134
}
134135

136+
@Builtin(name = "default_int_handler", minNumOfPositionalArgs = 0, takesVarArgs = true, takesVarKeywordArgs = false)
137+
@GenerateNodeFactory
138+
abstract static class DefaultIntHandlerNode extends PythonBuiltinNode {
139+
@Specialization
140+
Object defaultIntHandler(@SuppressWarnings("unused") Object[] args) {
141+
// TODO should be implemented properly.
142+
throw raise(PythonErrorType.KeyboardInterrupt);
143+
}
144+
}
145+
135146
@Builtin(name = "signal", fixedNumOfPositionalArgs = 2)
136147
@GenerateNodeFactory
137148
abstract static class SignalNode extends PythonBinaryBuiltinNode {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/UnicodeDataModuleBuiltins.java

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -47,9 +47,12 @@
4747

4848
import com.oracle.graal.python.builtins.Builtin;
4949
import com.oracle.graal.python.builtins.CoreFunctions;
50+
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
5051
import com.oracle.graal.python.builtins.PythonBuiltins;
52+
import com.oracle.graal.python.builtins.objects.object.PythonObject;
5153
import com.oracle.graal.python.builtins.objects.str.PString;
5254
import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
55+
import com.oracle.graal.python.runtime.PythonCore;
5356
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
5457
import com.oracle.truffle.api.dsl.Cached;
5558
import com.oracle.truffle.api.dsl.GenerateNodeFactory;
@@ -63,6 +66,83 @@ protected List<? extends NodeFactory<? extends PythonBuiltinNode>> getNodeFactor
6366
return UnicodeDataModuleBuiltinsFactory.getFactories();
6467
}
6568

69+
public static String getUnicodeVersion() {
70+
71+
// Preliminary Unicode 11 data obtained from
72+
// <https://www.unicode.org/Public/11.0.0/ucd/DerivedAge-11.0.0d13.txt>.
73+
if (Character.getType('\u0560') != Character.UNASSIGNED)
74+
return "11.0.0"; // 11.0, June 2018.
75+
76+
if (Character.getType('\u0860') != Character.UNASSIGNED)
77+
return "10.0.0"; // 10.0, June 2017.
78+
79+
if (Character.getType('\u08b6') != Character.UNASSIGNED)
80+
return "9.0.0"; // 9.0, June 2016.
81+
82+
if (Character.getType('\u08b3') != Character.UNASSIGNED)
83+
return "8.0.0"; // 8.0, June 2015.
84+
85+
if (Character.getType('\u037f') != Character.UNASSIGNED)
86+
return "7.0.0"; // 7.0, June 2014.
87+
88+
if (Character.getType('\u061c') != Character.UNASSIGNED)
89+
return "6.3.0"; // 6.3, September 2013.
90+
91+
if (Character.getType('\u20ba') != Character.UNASSIGNED)
92+
return "6.2.0"; // 6.2, September 2012.
93+
94+
if (Character.getType('\u058f') != Character.UNASSIGNED)
95+
return "6.1.0"; // 6.1, January 2012.
96+
97+
if (Character.getType('\u0526') != Character.UNASSIGNED)
98+
return "6.0.0"; // 6.0, October 2010.
99+
100+
if (Character.getType('\u0524') != Character.UNASSIGNED)
101+
return "5.2.0"; // 5.2, October 2009.
102+
103+
if (Character.getType('\u0370') != Character.UNASSIGNED)
104+
return "5.1.0"; // 5.1, March 2008.
105+
106+
if (Character.getType('\u0242') != Character.UNASSIGNED)
107+
return "5.0.0"; // 5.0, July 2006.
108+
109+
if (Character.getType('\u0237') != Character.UNASSIGNED)
110+
return "4.1.0"; // 4.1, March 2005.
111+
112+
if (Character.getType('\u0221') != Character.UNASSIGNED)
113+
return "4.0.0"; // 4.0, April 2003.
114+
115+
if (Character.getType('\u0220') != Character.UNASSIGNED)
116+
return "3.2.0"; // 3.2, March 2002.
117+
118+
if (Character.getType('\u03f4') != Character.UNASSIGNED)
119+
return "3.1.0"; // 3.1, March 2001.
120+
121+
if (Character.getType('\u01f6') != Character.UNASSIGNED)
122+
return "3.0.0"; // 3.0, September 1999.
123+
124+
if (Character.getType('\u20ac') != Character.UNASSIGNED)
125+
return "2.1.0"; // 2.1, May 1998.
126+
127+
if (Character.getType('\u0591') != Character.UNASSIGNED)
128+
return "2.0.0"; // 2.0, July 1996.
129+
130+
if (Character.getType('\u0000') != Character.UNASSIGNED)
131+
return "1.1.0"; // 1.1, June 1993.
132+
133+
return "1.0.0"; // 1.0
134+
}
135+
136+
@Override
137+
public void initialize(PythonCore core) {
138+
super.initialize(core);
139+
builtinConstants.put("version", getUnicodeVersion());
140+
PythonObject ucd_3_2_0 = core.factory().createPythonObject(core.lookupType(PythonBuiltinClassType.PythonObject));
141+
ucd_3_2_0.setAttribute("unidata_version", "3.2.0");
142+
builtinConstants.put("ucd_3_2_0", ucd_3_2_0); // TODO this is a fake object, just satisfy
143+
// pip installer import
144+
}
145+
66146
// unicodedata.normalize(form, unistr)
67147
@Builtin(name = "normalize", fixedNumOfPositionalArgs = 2)
68148
@GenerateNodeFactory

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/exception/PythonErrorType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates.
2+
* Copyright (c) 2017, 2019, Oracle and/or its affiliates.
33
* Copyright (c) 2013, Regents of the University of California
44
*
55
* All rights reserved.
@@ -40,6 +40,7 @@ public abstract class PythonErrorType {
4040
public static final PythonBuiltinClassType ImportError = PythonBuiltinClassType.ImportError;
4141
public static final PythonBuiltinClassType ImportWarning = PythonBuiltinClassType.ImportWarning;
4242
public static final PythonBuiltinClassType IndexError = PythonBuiltinClassType.IndexError;
43+
public static final PythonBuiltinClassType KeyboardInterrupt = PythonBuiltinClassType.KeyboardInterrupt;
4344
public static final PythonBuiltinClassType KeyError = PythonBuiltinClassType.KeyError;
4445
public static final PythonBuiltinClassType LookupError = PythonBuiltinClassType.LookupError;
4546
public static final PythonBuiltinClassType MemoryError = PythonBuiltinClassType.MemoryError;

graalpython/lib-graalpython/_socket.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,15 @@
4747
SOCK_RDM = 4
4848
SOCK_SEQPACKET = 5
4949

50+
IPPROTO_TCP = 6
51+
TCP_NODELAY = 1
52+
5053
has_ipv6 = False #: TODO implement me
5154
error = OSError
55+
56+
class timeout(OSError):
57+
pass
58+
5259
__default_timeout = None
5360

5461

graalpython/lib-graalpython/ctypes.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
22
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33
#
44
# The Universal Permissive License (UPL), Version 1.0
@@ -37,3 +37,19 @@
3737
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3838
# SOFTWARE.
3939

40+
# Taken from pypy
41+
class CDLL(object):
42+
"""An instance of this class represents a loaded dll/shared
43+
library, exporting functions using the standard C calling
44+
convention (named 'cdecl' on Windows).
45+
46+
The exported functions can be accessed as attributes, or by
47+
indexing with the function name. Examples:
48+
49+
<obj>.qsort -> callable object
50+
<obj>['qsort'] -> callable object
51+
52+
Calling the functions releases the Python GIL during the call and
53+
reacquires it afterwards.
54+
"""
55+
pass

0 commit comments

Comments
 (0)