Skip to content

Commit 10feb9a

Browse files
qunaibitqunaibit
committed
refactor lzma module
1 parent f85a1a8 commit 10feb9a

File tree

7 files changed

+15
-19
lines changed

7 files changed

+15
-19
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
import com.oracle.graal.python.builtins.modules.ItertoolsModuleBuiltins;
7070
import com.oracle.graal.python.builtins.modules.JArrayModuleBuiltins;
7171
import com.oracle.graal.python.builtins.modules.JavaModuleBuiltins;
72-
import com.oracle.graal.python.builtins.modules.LZMAModuleBuiltins;
7372
import com.oracle.graal.python.builtins.modules.LocaleModuleBuiltins;
7473
import com.oracle.graal.python.builtins.modules.LsprofModuleBuiltins;
7574
import com.oracle.graal.python.builtins.modules.MMapModuleBuiltins;
@@ -115,6 +114,9 @@
115114
import com.oracle.graal.python.builtins.modules.io.FileIOBuiltins;
116115
import com.oracle.graal.python.builtins.modules.io.IOBaseBuiltins;
117116
import com.oracle.graal.python.builtins.modules.io.IOModuleBuiltins;
117+
import com.oracle.graal.python.builtins.modules.lzma.LZMACompressorBuiltins;
118+
import com.oracle.graal.python.builtins.modules.lzma.LZMADecompressorBuiltins;
119+
import com.oracle.graal.python.builtins.modules.lzma.LZMAModuleBuiltins;
118120
import com.oracle.graal.python.builtins.modules.io.RawIOBaseBuiltins;
119121
import com.oracle.graal.python.builtins.modules.io.TextIOBaseBuiltins;
120122
import com.oracle.graal.python.builtins.modules.zlib.ZLibModuleBuiltins;
@@ -156,8 +158,6 @@
156158
import com.oracle.graal.python.builtins.objects.iterator.PZipBuiltins;
157159
import com.oracle.graal.python.builtins.objects.iterator.SentinelIteratorBuiltins;
158160
import com.oracle.graal.python.builtins.objects.list.ListBuiltins;
159-
import com.oracle.graal.python.builtins.objects.lzma.LZMACompressorBuiltins;
160-
import com.oracle.graal.python.builtins.objects.lzma.LZMADecompressorBuiltins;
161161
import com.oracle.graal.python.builtins.objects.map.MapBuiltins;
162162
import com.oracle.graal.python.builtins.objects.mappingproxy.MappingproxyBuiltins;
163163
import com.oracle.graal.python.builtins.objects.memoryview.BufferBuiltins;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/lzma/LZMACompressorBuiltins.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMACompressorBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, 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
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.graal.python.builtins.objects.lzma;
41+
package com.oracle.graal.python.builtins.modules.lzma;
4242

4343
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.LZMAError;
4444
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/lzma/LZMADecompressorBuiltins.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMADecompressorBuiltins.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, 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
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.graal.python.builtins.objects.lzma;
41+
package com.oracle.graal.python.builtins.modules.lzma;
4242

4343
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.OSError;
4444
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TypeError;
@@ -50,7 +50,6 @@
5050
import com.oracle.graal.python.builtins.CoreFunctions;
5151
import com.oracle.graal.python.builtins.PythonBuiltinClassType;
5252
import com.oracle.graal.python.builtins.PythonBuiltins;
53-
import com.oracle.graal.python.builtins.modules.LZMAModuleBuiltins;
5453
import com.oracle.graal.python.builtins.objects.PNone;
5554
import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
5655
import com.oracle.graal.python.builtins.objects.bytes.PBytes;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/LZMAModuleBuiltins.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/LZMAModuleBuiltins.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, 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
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.graal.python.builtins.modules;
41+
package com.oracle.graal.python.builtins.modules.lzma;
4242

4343
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.LZMAError;
4444
import static com.oracle.graal.python.builtins.PythonBuiltinClassType.PLZMACompressor;
@@ -71,8 +71,6 @@
7171
import com.oracle.graal.python.builtins.objects.PNone;
7272
import com.oracle.graal.python.builtins.objects.function.PArguments;
7373
import com.oracle.graal.python.builtins.objects.ints.PInt;
74-
import com.oracle.graal.python.builtins.objects.lzma.PLZMACompressor;
75-
import com.oracle.graal.python.builtins.objects.lzma.PLZMADecompressor;
7674
import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
7775
import com.oracle.graal.python.nodes.ErrorMessages;
7876
import com.oracle.graal.python.nodes.PGuards;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/lzma/PLZMACompressor.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/PLZMACompressor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, 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
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.graal.python.builtins.objects.lzma;
41+
package com.oracle.graal.python.builtins.modules.lzma;
4242

4343
import java.io.ByteArrayOutputStream;
4444

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/lzma/PLZMADecompressor.java renamed to ‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/lzma/PLZMADecompressor.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2020, 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
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package com.oracle.graal.python.builtins.objects.lzma;
41+
package com.oracle.graal.python.builtins.modules.lzma;
4242

4343
import java.io.ByteArrayInputStream;
4444
import java.io.ByteArrayOutputStream;
@@ -49,7 +49,6 @@
4949
import org.tukaani.xz.XZFormatException;
5050
import org.tukaani.xz.XZInputStream;
5151

52-
import com.oracle.graal.python.builtins.modules.LZMAModuleBuiltins;
5352
import com.oracle.graal.python.builtins.objects.object.PythonObject;
5453
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
5554
import com.oracle.truffle.api.object.Shape;

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.PosixFileHandle;
3939
import com.oracle.graal.python.builtins.modules.bz2.BZ2Object;
4040
import com.oracle.graal.python.builtins.modules.io.PBuffered;
41+
import com.oracle.graal.python.builtins.modules.lzma.PLZMACompressor;
42+
import com.oracle.graal.python.builtins.modules.lzma.PLZMADecompressor;
4143
import com.oracle.graal.python.builtins.modules.io.PFileIO;
4244
import com.oracle.graal.python.builtins.modules.zlib.ZLibCompObject;
4345
import com.oracle.graal.python.builtins.objects.array.PArray;
@@ -88,8 +90,6 @@
8890
import com.oracle.graal.python.builtins.objects.iterator.PStringIterator;
8991
import com.oracle.graal.python.builtins.objects.iterator.PZip;
9092
import com.oracle.graal.python.builtins.objects.list.PList;
91-
import com.oracle.graal.python.builtins.objects.lzma.PLZMACompressor;
92-
import com.oracle.graal.python.builtins.objects.lzma.PLZMADecompressor;
9393
import com.oracle.graal.python.builtins.objects.map.PMap;
9494
import com.oracle.graal.python.builtins.objects.mappingproxy.PMappingproxy;
9595
import com.oracle.graal.python.builtins.objects.memoryview.ManagedBuffer;

0 commit comments

Comments
 (0)