Skip to content

Commit d2384ef

Browse files
dpgeorgedpgeorge
committed
py: Automatically provide weak links from "foo" to "ufoo" module name.
This commit implements automatic module weak links for all built-in modules, by searching for "ufoo" in the built-in module list if "foo" cannot be found. This means that all modules named "ufoo" are always available as "foo". Also, a port can no longer add any other weak links, which makes strict the definition of a weak link. It saves some code size (about 100-200 bytes) on ports that previously had lots of weak links. Some changes from the previous behaviour: - It doesn't intern the non-u module names (eg "foo" is not interned), which saves code size, but will mean that "import foo" creates a new qstr (namely "foo") in RAM (unless the importing module is frozen). - help('modules') no longer lists non-u module names, only the u-variants; this reduces duplication in the help listing. Weak links are effectively the same as having a set of symbolic links on the filesystem that is searched last. So an "import foo" will search built-in modules first, then all paths in sys.path, then weak links last, importing "ufoo" if it exists. Thus a file called "foo.py" somewhere in sys.path will still have precedence over the weak link of "foo" to "ufoo". See issues: adafruit#1740, adafruit#4449, adafruit#5229, adafruit#5241.
1 parent 9c5262f commit d2384ef

File tree

12 files changed

+32
-135
lines changed

12 files changed

+32
-135
lines changed

‎ports/cc3200/mpconfigport.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,6 @@ extern const struct _mp_obj_module_t mp_module_ussl;
169169
{ MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
170170
{ MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) }, \
171171

172-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
173-
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \
174-
{ MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&mp_module_ustruct) }, \
175-
{ MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) }, \
176-
{ MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \
177-
{ MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&mp_module_uos) }, \
178-
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
179-
{ MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_module_uselect) }, \
180-
{ MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) }, \
181-
{ MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
182-
{ MP_ROM_QSTR(MP_QSTR_ssl), MP_ROM_PTR(&mp_module_ussl) }, \
183-
{ MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) }, \
184-
185172
// extra constants
186173
#define MICROPY_PORT_CONSTANTS \
187174
{ MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) }, \

‎ports/esp32/mpconfigport.h

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -212,24 +212,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
212212
{ MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
213213
{ MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib), (mp_obj_t)&mp_module_uhashlib }, \
214214

215-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
216-
{ MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
217-
{ MP_OBJ_NEW_QSTR(MP_QSTR_collections), (mp_obj_t)&mp_module_collections }, \
218-
{ MP_OBJ_NEW_QSTR(MP_QSTR_errno), (mp_obj_t)&mp_module_uerrno }, \
219-
{ MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)&mp_module_uhashlib }, \
220-
{ MP_OBJ_NEW_QSTR(MP_QSTR_heapq), (mp_obj_t)&mp_module_uheapq }, \
221-
{ MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
222-
{ MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
223-
{ MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
224-
{ MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
225-
{ MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
226-
{ MP_OBJ_NEW_QSTR(MP_QSTR_select), (mp_obj_t)&mp_module_uselect }, \
227-
{ MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&mp_module_usocket }, \
228-
{ MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
229-
{ MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \
230-
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
231-
{ MP_OBJ_NEW_QSTR(MP_QSTR_zlib), (mp_obj_t)&mp_module_uzlib }, \
232-
233215
#define MP_STATE_PORT MP_STATE_VM
234216

235217
struct _machine_timer_obj_t;

‎ports/esp8266/mpconfigport.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -167,23 +167,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
167167
{ MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
168168
{ MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
169169

170-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
171-
{ MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
172-
{ MP_ROM_QSTR(MP_QSTR_collections), MP_ROM_PTR(&mp_module_collections) }, \
173-
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \
174-
{ MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, \
175-
{ MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, \
176-
{ MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \
177-
{ MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&uos_module) }, \
178-
{ MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mp_module_urandom) }, \
179-
{ MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) }, \
180-
{ MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_module_uselect) }, \
181-
{ MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_lwip) }, \
182-
{ MP_ROM_QSTR(MP_QSTR_ssl), MP_ROM_PTR(&mp_module_ussl) }, \
183-
{ MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&mp_module_ustruct) }, \
184-
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&utime_module) }, \
185-
{ MP_ROM_QSTR(MP_QSTR_zlib), MP_ROM_PTR(&mp_module_uzlib) }, \
186-
187170
#define MP_STATE_PORT MP_STATE_VM
188171

189172
#define MICROPY_PORT_ROOT_POINTERS \

‎ports/javascript/mpconfigport.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,6 @@ extern const struct _mp_obj_module_t mp_module_utime;
131131
#define MICROPY_PORT_BUILTIN_MODULES \
132132
{ MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
133133

134-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
135-
{ MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
136-
{ MP_ROM_QSTR(MP_QSTR_collections), MP_ROM_PTR(&mp_module_collections) }, \
137-
{ MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) }, \
138-
{ MP_ROM_QSTR(MP_QSTR_zlib), MP_ROM_PTR(&mp_module_uzlib) }, \
139-
{ MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \
140-
{ MP_ROM_QSTR(MP_QSTR_heapq), MP_ROM_PTR(&mp_module_uheapq) }, \
141-
{ MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, \
142-
{ MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, \
143-
{ MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mp_module_urandom) }, \
144-
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
145-
{ MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_module_uselect) }, \
146-
{ MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&mp_module_ustruct) }, \
147-
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \
148-
149134
//#define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
150135
#if MICROPY_PY_THREAD
151136
#define MICROPY_EVENT_POLL_HOOK \

‎ports/nrf/mpconfigport.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,6 @@ extern const struct _mp_obj_module_t ble_module;
281281

282282
#endif // BLUETOOTH_SD
283283

284-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
285-
{ MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&mp_module_uos) }, \
286-
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
287-
288284
// extra built in names to add to the global namespace
289285
#define MICROPY_PORT_BUILTINS \
290286
{ MP_ROM_QSTR(MP_QSTR_help), MP_ROM_PTR(&mp_builtin_help_obj) }, \

‎ports/stm32/mpconfigport.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -223,21 +223,12 @@ extern const struct _mp_obj_module_t mp_module_onewire;
223223
#if MICROPY_PY_USOCKET && MICROPY_PY_LWIP
224224
// usocket implementation provided by lwIP
225225
#define SOCKET_BUILTIN_MODULE { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) },
226-
#define SOCKET_BUILTIN_MODULE_WEAK_LINKS { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_lwip) },
227226
#elif MICROPY_PY_USOCKET
228227
// usocket implementation provided by skeleton wrapper
229228
#define SOCKET_BUILTIN_MODULE { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
230-
#define SOCKET_BUILTIN_MODULE_WEAK_LINKS { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) },
231229
#else
232230
// no usocket module
233231
#define SOCKET_BUILTIN_MODULE
234-
#define SOCKET_BUILTIN_MODULE_WEAK_LINKS
235-
#endif
236-
237-
#if MICROPY_PY_USSL
238-
#define SSL_BUILTIN_MODULE_WEAK_LINKS { MP_ROM_QSTR(MP_QSTR_ssl), MP_ROM_PTR(&mp_module_ussl) },
239-
#else
240-
#define SSL_BUILTIN_MODULE_WEAK_LINKS
241232
#endif
242233

243234
#if MICROPY_PY_NETWORK
@@ -263,25 +254,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
263254
BLUETOOTH_BUILTIN_MODULE \
264255
{ MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
265256

266-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
267-
{ MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
268-
{ MP_ROM_QSTR(MP_QSTR_collections), MP_ROM_PTR(&mp_module_collections) }, \
269-
{ MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) }, \
270-
{ MP_ROM_QSTR(MP_QSTR_zlib), MP_ROM_PTR(&mp_module_uzlib) }, \
271-
{ MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \
272-
{ MP_ROM_QSTR(MP_QSTR_heapq), MP_ROM_PTR(&mp_module_uheapq) }, \
273-
{ MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, \
274-
{ MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, \
275-
{ MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&mp_module_uos) }, \
276-
{ MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mp_module_urandom) }, \
277-
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
278-
{ MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_module_uselect) }, \
279-
SOCKET_BUILTIN_MODULE_WEAK_LINKS \
280-
SSL_BUILTIN_MODULE_WEAK_LINKS \
281-
{ MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&mp_module_ustruct) }, \
282-
{ MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) }, \
283-
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) }, \
284-
285257
// extra constants
286258
#define MICROPY_PORT_CONSTANTS \
287259
{ MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) }, \

‎ports/zephyr/mpconfigport.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,8 @@ extern const struct _mp_obj_module_t mp_module_zsensor;
119119

120120
#if MICROPY_PY_USOCKET
121121
#define MICROPY_PY_USOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
122-
#define MICROPY_PY_USOCKET_WEAK_DEF { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) },
123122
#else
124123
#define MICROPY_PY_USOCKET_DEF
125-
#define MICROPY_PY_USOCKET_WEAK_DEF
126124
#endif
127125

128126
#if MICROPY_PY_UTIME
@@ -150,10 +148,6 @@ extern const struct _mp_obj_module_t mp_module_zsensor;
150148
MICROPY_PY_ZEPHYR_DEF \
151149
MICROPY_PY_ZSENSOR_DEF \
152150

153-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
154-
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_time) }, \
155-
MICROPY_PY_USOCKET_WEAK_DEF \
156-
157151
// extra built in names to add to the global namespace
158152
#define MICROPY_PORT_BUILTINS \
159153

‎py/builtinhelp.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ STATIC void mp_help_print_modules(void) {
8080

8181
mp_help_add_from_map(list, &mp_builtin_module_map);
8282

83-
#if MICROPY_MODULE_WEAK_LINKS
84-
mp_help_add_from_map(list, &mp_builtin_module_weak_links_map);
85-
#endif
86-
8783
#if MICROPY_MODULE_FROZEN_STR
8884
extern const char mp_frozen_str_names[];
8985
mp_help_add_from_names(list, mp_frozen_str_names);

‎py/builtinimport.c

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2013, 2014 Damien P. George
6+
* Copyright (c) 2013-2019 Damien P. George
77
* Copyright (c) 2014 Paul Sokolovsky
88
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -381,21 +381,18 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
381381
DEBUG_printf("Current path: %.*s\n", vstr_len(&path), vstr_str(&path));
382382

383383
if (stat == MP_IMPORT_STAT_NO_EXIST) {
384+
module_obj = MP_OBJ_NULL;
384385
#if MICROPY_MODULE_WEAK_LINKS
385386
// check if there is a weak link to this module
386387
if (i == mod_len) {
387-
mp_map_elem_t *el = mp_map_lookup((mp_map_t*)&mp_builtin_module_weak_links_map, MP_OBJ_NEW_QSTR(mod_name), MP_MAP_LOOKUP);
388-
if (el == NULL) {
389-
goto no_exist;
388+
module_obj = mp_module_search_umodule(mod_str);
389+
if (module_obj != MP_OBJ_NULL) {
390+
// found weak linked module
391+
mp_module_call_init(mod_name, module_obj);
390392
}
391-
// found weak linked module
392-
module_obj = el->value;
393-
mp_module_call_init(mod_name, module_obj);
394-
} else {
395-
no_exist:
396-
#else
397-
{
393+
}
398394
#endif
395+
if (module_obj == MP_OBJ_NULL) {
399396
// couldn't find the file, so fail
400397
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
401398
mp_raise_msg(&mp_type_ImportError, "module not found");
@@ -492,11 +489,11 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
492489

493490
#if MICROPY_MODULE_WEAK_LINKS
494491
// Check if there is a weak link to this module
495-
mp_map_elem_t *el = mp_map_lookup((mp_map_t*)&mp_builtin_module_weak_links_map, MP_OBJ_NEW_QSTR(module_name_qstr), MP_MAP_LOOKUP);
496-
if (el != NULL) {
492+
module_obj = mp_module_search_umodule(qstr_str(module_name_qstr));
493+
if (module_obj != MP_OBJ_NULL) {
497494
// Found weak-linked module
498-
mp_module_call_init(module_name_qstr, el->value);
499-
return el->value;
495+
mp_module_call_init(module_name_qstr, module_obj);
496+
return module_obj;
500497
}
501498
#endif
502499

‎py/mpconfig.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,11 +1392,6 @@ typedef double mp_float_t;
13921392
#define MICROPY_PORT_BUILTIN_MODULES
13931393
#endif
13941394

1395-
// Any module weak links - see objmodule.c:mp_builtin_module_weak_links_table.
1396-
#ifndef MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS
1397-
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS
1398-
#endif
1399-
14001395
// Additional constant definitions for the compiler - see compile.c:mp_constants_table.
14011396
#ifndef MICROPY_PORT_CONSTANTS
14021397
#define MICROPY_PORT_CONSTANTS

‎py/objmodule.c

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2013, 2014 Damien P. George
6+
* Copyright (c) 2013-2019 Damien P. George
77
* Copyright (c) 2014-2015 Paul Sokolovsky
88
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,6 +26,7 @@
2626
*/
2727

2828
#include <stdlib.h>
29+
#include <string.h>
2930
#include <assert.h>
3031

3132
#include "py/objmodule.h"
@@ -235,14 +236,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
235236

236237
MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
237238

238-
#if MICROPY_MODULE_WEAK_LINKS
239-
STATIC const mp_rom_map_elem_t mp_builtin_module_weak_links_table[] = {
240-
MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS
241-
};
242-
243-
MP_DEFINE_CONST_MAP(mp_builtin_module_weak_links_map, mp_builtin_module_weak_links_table);
244-
#endif
245-
246239
// returns MP_OBJ_NULL if not found
247240
mp_obj_t mp_module_get(qstr module_name) {
248241
mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
@@ -267,6 +260,21 @@ void mp_module_register(qstr qst, mp_obj_t module) {
267260
mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
268261
}
269262

263+
#if MICROPY_MODULE_WEAK_LINKS
264+
// Search for u"foo" in built-in modules, return MP_OBJ_NULL if not found
265+
mp_obj_t mp_module_search_umodule(const char *module_str) {
266+
for (size_t i = 0; i < MP_ARRAY_SIZE(mp_builtin_module_table); ++i) {
267+
const mp_map_elem_t *entry = (const mp_map_elem_t*)&mp_builtin_module_table[i];
268+
const char *key = qstr_str(MP_OBJ_QSTR_VALUE(entry->key));
269+
if (key[0] == 'u' && strcmp(&key[1], module_str) == 0) {
270+
return (mp_obj_t)entry->value;
271+
}
272+
273+
}
274+
return MP_OBJ_NULL;
275+
}
276+
#endif
277+
270278
#if MICROPY_MODULE_BUILTIN_INIT
271279
void mp_module_call_init(qstr module_name, mp_obj_t module_obj) {
272280
// Look for __init__ and call it if it exists

‎py/objmodule.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2013, 2014 Damien P. George
6+
* Copyright (c) 2013-2019 Damien P. George
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,8 @@ extern const mp_map_t mp_builtin_module_weak_links_map;
3434
mp_obj_t mp_module_get(qstr module_name);
3535
void mp_module_register(qstr qstr, mp_obj_t module);
3636

37+
mp_obj_t mp_module_search_umodule(const char *module_str);
38+
3739
#if MICROPY_MODULE_BUILTIN_INIT
3840
void mp_module_call_init(qstr module_name, mp_obj_t module_obj);
3941
#else

0 commit comments

Comments
 (0)