summaryrefslogtreecommitdiff
path: root/lib/netutils
diff options
context:
space:
mode:
authorGlenn Ruben Bakke <glennbakke@gmail.com>2017-10-04 21:45:04 +0200
committerGlenn Ruben Bakke <glennbakke@gmail.com>2017-10-04 21:45:04 +0200
commitbcab2ba0a80297100919366add6bada140c6ed75 (patch)
tree5133218f4fc010d5688f006dbdd1e2f346a843f7 /lib/netutils
parent4468731e3d039a3f72ac25aa43e936cf5ebb3f78 (diff)
parentf869d6b2e339c04469c6c9ea3fb2fabd7bbb2d8c (diff)
ports/nrf: Upmerging port with upstream master
Diffstat (limited to 'lib/netutils')
-rw-r--r--lib/netutils/netutils.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/netutils/netutils.c b/lib/netutils/netutils.c
index a32452161..06c3ff9b0 100644
--- a/lib/netutils/netutils.c
+++ b/lib/netutils/netutils.c
@@ -29,8 +29,7 @@
#include <stdio.h>
#include <string.h>
-#include "py/obj.h"
-#include "py/nlr.h"
+#include "py/runtime.h"
#include "lib/netutils/netutils.h"
// Takes an array with a raw IPv4 address and returns something like '192.168.0.1'.
@@ -80,7 +79,7 @@ void netutils_parse_ipv4_addr(mp_obj_t addr_in, uint8_t *out_ip, netutils_endian
} else if (i > 0 && s < s_top && *s == '.') {
s++;
} else {
- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "invalid arguments"));
+ mp_raise_ValueError("invalid arguments");
}
}
}