Skip to content

Commit f675ff3

Browse files
committed
Merge pull request adafruit#665 from Rosuav/naming3.3
Change comments (mainly URLs) to no longer specifically say Python 3.3
2 parents 11de839 + daf973a commit f675ff3

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

py/builtin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ STATIC mp_obj_t mp_builtin_hasattr(mp_obj_t object_in, mp_obj_t attr_in) {
466466
assert(MP_OBJ_IS_QSTR(attr_in));
467467

468468
mp_obj_t dest[2];
469-
// TODO: https://docs.python.org/3.3/library/functions.html?highlight=hasattr#hasattr
469+
// TODO: https://docs.python.org/3/library/functions.html?highlight=hasattr#hasattr
470470
// explicitly says "This is implemented by calling getattr(object, name) and seeing
471471
// whether it raises an AttributeError or not.", so we should explicitly wrap this
472472
// in nlr_push and handle exception.

py/builtinimport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ mp_obj_t mp_builtin___import__(uint n_args, mp_obj_t *args) {
306306

307307
if (stat == MP_IMPORT_STAT_DIR) {
308308
DEBUG_printf("%s is dir\n", vstr_str(&path));
309-
// https://docs.python.org/3.3/reference/import.html
309+
// https://docs.python.org/3/reference/import.html
310310
// "Specifically, any module that contains a __path__ attribute is considered a package."
311311
mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str(vstr_str(&path), vstr_len(&path), false));
312312
vstr_add_char(&path, PATH_SEP_CHAR);

py/objexcept.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const mp_obj_type_t mp_type_ ## exc_name = { \
157157
};
158158

159159
// List of all exceptions, arranged as in the table at:
160-
// http://docs.python.org/3.3/library/exceptions.html
160+
// http://docs.python.org/3/library/exceptions.html
161161
MP_DEFINE_EXCEPTION_BASE(BaseException)
162162
MP_DEFINE_EXCEPTION(SystemExit, BaseException)
163163
//MP_DEFINE_EXCEPTION(KeyboardInterrupt, BaseException)

py/objtype.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ STATIC const qstr binary_op_method_name[] = {
352352
// Given a member that was extracted from an instance, convert it correctly
353353
// and put the result in the dest[] array for a possible method call.
354354
// Conversion means dealing with static/class methods, callables, and values.
355-
// see http://docs.python.org/3.3/howto/descriptor.html
355+
// see http://docs.python.org/3/howto/descriptor.html
356356
STATIC void instance_convert_return_attr(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t member, mp_obj_t *dest) {
357357
assert(dest[1] == NULL);
358358
if (MP_OBJ_IS_TYPE(member, &mp_type_staticmethod)) {

py/runtime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ void mp_load_method_maybe(mp_obj_t base, qstr attr, mp_obj_t *dest) {
837837
mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
838838
if (elem != NULL) {
839839
// check if the methods are functions, static or class methods
840-
// see http://docs.python.org/3.3/howto/descriptor.html
840+
// see http://docs.python.org/3/howto/descriptor.html
841841
if (MP_OBJ_IS_TYPE(elem->value, &mp_type_staticmethod)) {
842842
// return just the function
843843
dest[0] = ((mp_obj_static_class_method_t*)elem->value)->fun;

tests/basics/string-repr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# anything above 0xa0 is printed as Unicode by CPython3.3
1+
# anything above 0xa0 is printed as Unicode by CPython
22
for c in range(0xa1):
33
print("0x%02x: %s" % (c, repr(chr(c))))

0 commit comments

Comments
 (0)