Skip to content

Commit 12b6b78

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'micropython/master'
2 parents eda3338 + 67d52d8 commit 12b6b78

File tree

160 files changed

+714
-51527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+714
-51527
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ script:
4747
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests)
4848
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests -d thread)
4949
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --emit native)
50+
- (cd tests && MICROPY_CPYTHON3=python3.4 MICROPY_MICROPYTHON=../unix/micropython_coverage ./run-tests --via-mpy -d basics)
5051

5152
after_success:
5253
- (cd unix && coveralls --root .. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)

‎README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
[![Build Status][travis-img]][travis-repo] [![Coverage Status][coveralls-img]][coveralls-repo] [![Issue Stats][istats-pr-img]][istats-pr-repo] [![Issue Stats][istats-issue-img]][istats-issue-repo]
1+
[![Build Status][travis-img]][travis-repo] [![Coverage Status][coveralls-img]][coveralls-repo]
22
[travis-img]: https://travis-ci.org/micropython/micropython.png?branch=master
33
[travis-repo]: https://travis-ci.org/micropython/micropython
44
[coveralls-img]: https://coveralls.io/repos/micropython/micropython/badge.png?branch=master
55
[coveralls-repo]: https://coveralls.io/r/micropython/micropython?branch=master
6-
[istats-pr-img]: http://issuestats.com/github/micropython/micropython/badge/pr
7-
[istats-pr-repo]: http://issuestats.com/github/micropython/micropython
8-
[istats-issue-img]: http://issuestats.com/github/micropython/micropython/badge/issue
9-
[istats-issue-repo]: http://issuestats.com/github/micropython/micropython
106

117
The MicroPython project
128
=======================

‎cc3200/mods/modmachine.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,5 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table
213213

214214
const mp_obj_module_t machine_module = {
215215
.base = { &mp_type_module },
216-
.name = MP_QSTR_umachine,
217216
.globals = (mp_obj_dict_t*)&machine_module_globals,
218217
};

‎cc3200/mods/modnetwork.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals
161161

162162
const mp_obj_module_t mp_module_network = {
163163
.base = { &mp_type_module },
164-
.name = MP_QSTR_network,
165164
.globals = (mp_obj_dict_t*)&mp_module_network_globals,
166165
};
167166

‎cc3200/mods/modubinascii.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_binascii_globals, mp_module_binascii_globa
5858

5959
const mp_obj_module_t mp_module_ubinascii = {
6060
.base = { &mp_type_module },
61-
.name = MP_QSTR_ubinascii,
6261
.globals = (mp_obj_dict_t*)&mp_module_binascii_globals,
6362
};

‎cc3200/mods/moduhashlib.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_hashlib_globals, mp_module_hashlib_globals
204204

205205
const mp_obj_module_t mp_module_uhashlib = {
206206
.base = { &mp_type_module },
207-
.name = MP_QSTR_uhashlib,
208207
.globals = (mp_obj_dict_t*)&mp_module_hashlib_globals,
209208
};
210209

‎cc3200/mods/moduos.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,5 @@ STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
602602

603603
const mp_obj_module_t mp_module_uos = {
604604
.base = { &mp_type_module },
605-
.name = MP_QSTR_uos,
606605
.globals = (mp_obj_dict_t*)&os_module_globals,
607606
};

‎cc3200/mods/modusocket.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,5 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals
541541

542542
const mp_obj_module_t mp_module_usocket = {
543543
.base = { &mp_type_module },
544-
.name = MP_QSTR_usocket,
545544
.globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
546545
};

‎cc3200/mods/modussl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ STATIC MP_DEFINE_CONST_DICT(mp_module_ussl_globals, mp_module_ussl_globals_table
152152

153153
const mp_obj_module_t mp_module_ussl = {
154154
.base = { &mp_type_module },
155-
.name = MP_QSTR_ussl,
156155
.globals = (mp_obj_dict_t*)&mp_module_ussl_globals,
157156
};
158157

‎cc3200/mods/modutime.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,5 @@ STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
196196

197197
const mp_obj_module_t mp_module_utime = {
198198
.base = { &mp_type_module },
199-
.name = MP_QSTR_utime,
200199
.globals = (mp_obj_dict_t*)&time_module_globals,
201200
};

0 commit comments

Comments
 (0)