Skip to content

Commit 99f8d62

Browse files
cosminbascacosminbasca
committed
test_import: retag unittests
- style fixes
1 parent 2bf5cd3 commit 99f8d62

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_import.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_binding
2+
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_circular_from_import
13
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_crossreference1
24
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_crossreference2
35
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_direct
@@ -6,6 +8,7 @@
68
*graalpython.lib-python.3.test.test_import.__init__.CircularImportTests.test_subpackage
79
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_cached_mode_issue_2051
810
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_cached_readonly
11+
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_creation_mode
912
*graalpython.lib-python.3.test.test_import.__init__.FilePermissionTests.test_pyc_always_writable
1013
*graalpython.lib-python.3.test.test_import.__init__.GetSourcefileTests.test_get_sourcefile
1114
*graalpython.lib-python.3.test.test_import.__init__.GetSourcefileTests.test_get_sourcefile_bad_ext
@@ -17,13 +20,18 @@
1720
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_dll_dependency_import
1821
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_double_const
1922
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_failing_import_sticks
23+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_failing_reload
2024
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_file_to_source
25+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_AttributeError
2126
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_message_for_existing_module
2227
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_message_for_nonexistent_module
2328
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_has_name
29+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_has_name_and_path
2430
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_has_name_and_so_path
31+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_path_is_canonical
2532
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_attr_raises_ImportError
2633
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_missing_module_raises_ModuleNotFoundError
34+
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_from_import_star_invalid_type
2735
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_import
2836
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_import_by_filename
2937
*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_import_in_del_does_not_crash
@@ -38,17 +46,22 @@
3846
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_broken_parent_from
3947
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_broken_submodule
4048
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_exec_failure
49+
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_exec_failure_nested
4150
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_import_bug
4251
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_nonexistent_module
52+
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_nonexistent_module_nested
4353
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_syntax_error
4454
*graalpython.lib-python.3.test.test_import.__init__.ImportTracebackTests.test_unencodable_filename
4555
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_frozen_importlib
4656
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_frozen_importlib_external_is_bootstrap_external
4757
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_frozen_importlib_is_bootstrap
4858
*graalpython.lib-python.3.test.test_import.__init__.ImportlibBootstrapTests.test_there_can_be_only_one
59+
*graalpython.lib-python.3.test.test_import.__init__.OverridingImportBuiltinTests.test_override_builtin
4960
*graalpython.lib-python.3.test.test_import.__init__.PathsTests.test_UNC_path
5061
*graalpython.lib-python.3.test.test_import.__init__.PathsTests.test_trailing_slash
5162
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_basics
63+
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_foreign_code
64+
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_incorrect_code_name
5265
*graalpython.lib-python.3.test.test_import.__init__.PycRewritingTests.test_module_without_source
5366
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test___cached__
5467
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test___cached___legacy_pyc
@@ -58,9 +71,11 @@
5871
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_package___cached__
5972
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_package___cached___from_pyc
6073
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_recompute_pyc_same_second
74+
*graalpython.lib-python.3.test.test_import.__init__.PycacheTests.test_unwritable_directory
6175
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_absolute_import_without_future
6276
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_import_from_non_package
6377
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_import_from_unloaded_package
6478
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_issue3221
6579
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_parentless_import_shadowed_by_global
6680
*graalpython.lib-python.3.test.test_import.__init__.RelativeImportTests.test_relimport_star
81+
*graalpython.lib-python.3.test.test_import.__init__.TestSymbolicallyLinkedPackage.test_symlinked_dir_importable

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -534,15 +534,15 @@ public String toString() {
534534
return String.format("<code object %s, file \"%s\", line %d>", codeName, codeFilename, codeFirstLineNo);
535535
}
536536

537-
private PTuple createTuple(Object[] array, PythonObjectFactory factory) {
537+
private static PTuple createTuple(Object[] array, PythonObjectFactory factory) {
538538
Object[] data = array;
539539
if (data == null) {
540540
data = new Object[0];
541541
}
542542
return factory.createTuple(data);
543543
}
544544

545-
private PBytes createBytes(byte[] array, PythonObjectFactory factory) {
545+
private static PBytes createBytes(byte[] array, PythonObjectFactory factory) {
546546
byte[] bytes = array;
547547
if (bytes == null) {
548548
bytes = new byte[0];
@@ -557,9 +557,9 @@ public String co_name() {
557557
}
558558

559559
public String co_filename() {
560-
String filename = this.getFilename();
561-
assert filename != null : "PCode.co_filename cannot be null";
562-
return filename;
560+
String fName = this.getFilename();
561+
assert fName != null : "PCode.co_filename cannot be null";
562+
return fName;
563563
}
564564

565565
public PBytes co_code(PythonObjectFactory factory) {

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/ImportFromNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void executeVoid(VirtualFrame frame) {
130130
}
131131
}
132132

133-
private boolean isModuleInitialising(VirtualFrame frame, PythonObjectLibrary pol, Object importedModule) {
133+
private static boolean isModuleInitialising(VirtualFrame frame, PythonObjectLibrary pol, Object importedModule) {
134134
Object spec = pol.lookupAttribute(importedModule, frame, __SPEC__);
135135
if (spec != PNone.NO_VALUE) {
136136
Object initializing = pol.lookupAttribute(spec, frame, "_initializing");

0 commit comments

Comments
 (0)