diff --git a/src/opentimelineio/errorStatus.cpp b/src/opentimelineio/errorStatus.cpp index 87070298d..96c7f8ea9 100644 --- a/src/opentimelineio/errorStatus.cpp +++ b/src/opentimelineio/errorStatus.cpp @@ -63,7 +63,7 @@ ErrorStatus::outcome_to_string(Outcome o) case MEDIA_REFERENCES_DO_NOT_CONTAIN_ACTIVE_KEY: return "active key not found in media references"; case MEDIA_REFERENCES_CONTAIN_EMPTY_KEY: - return "the media referencess cannot contain an empty key"; + return "the media references cannot contain an empty key"; default: return "unknown/illegal ErrorStatus::Outcome code"; }; diff --git a/src/opentimelineio/serializableObject.h b/src/opentimelineio/serializableObject.h index 46f34dad2..811e7e55d 100644 --- a/src/opentimelineio/serializableObject.h +++ b/src/opentimelineio/serializableObject.h @@ -38,7 +38,7 @@ class SerializableObject * You cannot directly delete a SerializableObject* (or, hopefully, anything * derived from it, as all derivations are required to protect the destructor). * - * Instead, call the member funtion possibly_delete(), which deletes the object + * Instead, call the member function possibly_delete(), which deletes the object * (and, recursively, the objects owned by this object), provided the objects * are not under external management (e.g. prevented from being deleted because an * external scripting system is holding a reference to them). @@ -72,7 +72,7 @@ class SerializableObject // is set appropriately. SerializableObject* clone(ErrorStatus* error_status = nullptr) const; - // Allow external system (e.g. Python, Swifft) to add serializable fields + // Allow external system (e.g. Python, Swift) to add serializable fields // on the fly. C++ implementations should have no need for this functionality. AnyDictionary& dynamic_fields() { return _dynamic_fields; } diff --git a/src/opentimelineview/timeline_widget.py b/src/opentimelineview/timeline_widget.py index a565aa1be..6d7053c7a 100644 --- a/src/opentimelineview/timeline_widget.py +++ b/src/opentimelineview/timeline_widget.py @@ -379,7 +379,7 @@ def _cache_tracks(self): ''' Create a doubly linked list to navigate from track to track: track->get_next_up & track->get_next_up - "map_to_wodget" : Create a map to retrieve the pyside widget from + "map_to_widget" : Create a map to retrieve the pyside widget from the otio item ''' data_cache = dict() @@ -785,7 +785,7 @@ def set_timeline(self, timeline): self.add_stack(timeline.tracks) def add_stack(self, stack): - """open a tab for the stack or go to it if already present""" + """Open a tab for the stack or go to it if already present""" # find the tab for the stack if the tab has already been opened tab_index = next( diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h b/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h index 882b46b68..fac8ae280 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_anyVector.h @@ -14,7 +14,7 @@ struct AnyVectorProxy : public AnyVector::MutationStamp { using MutationStamp = AnyVector::MutationStamp; static void throw_array_was_deleted() { - throw py::value_error("underlying C++ AnyVector object has been destroyed"); + throw py::value_error("Underlying C++ AnyVector object has been destroyed"); } struct Iterator { diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp index 81b0edc57..be2257498 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp @@ -18,7 +18,7 @@ CLASS _type_checked(py::object const& rhs, char const* op) { } catch (...) { std::string rhs_type = py::cast(rhs.get_type().attr("__name__")); - throw py::type_error(string_printf("unsupported operand type(s) for %s: " + throw py::type_error(string_printf("Unsupported operand type(s) for %s: " "%s and %s", typeid(CLASS).name(), op, rhs_type.c_str())); } } diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp index 894406fc0..9f25259d7 100644 --- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp +++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.cpp @@ -114,7 +114,7 @@ AnyDictionary py_to_any_dictionary(py::object const& o) { any a; py_to_any(o, &a); if (!compare_typeids(a.type(), typeid(AnyDictionary))) { - throw py::type_error(string_printf("expected an AnyDictionary (i.e. metadata); got %s instead", + throw py::type_error(string_printf("Expected an AnyDictionary (i.e. metadata); got %s instead", type_name_for_error_message(a).c_str())); } diff --git a/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py b/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py index 6da824fd6..38cd1779d 100644 --- a/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py +++ b/src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py @@ -152,7 +152,7 @@ def _generate_model_for_module(mod, classes, modules): modules.add(mod) # fetch the classes from this module - serializeable_classes = [ + serializable_classes = [ thing for thing in mod.__dict__.values() if ( inspect.isclass(thing) @@ -168,7 +168,7 @@ def _generate_model_for_module(mod, classes, modules): # serialize/deserialize the classes to capture their serialized parameters model = {} - for cl in serializeable_classes: + for cl in serializable_classes: if cl in SKIP_CLASSES: continue diff --git a/src/py-opentimelineio/opentimelineio/hooks.py b/src/py-opentimelineio/opentimelineio/hooks.py index eef65d65d..2741856ec 100644 --- a/src/py-opentimelineio/opentimelineio/hooks.py +++ b/src/py-opentimelineio/opentimelineio/hooks.py @@ -141,7 +141,7 @@ def available_hookscripts(): def scripts_attached_to(hook): - """Return an editable list of all the hook scriptss that are attached to + """Return an editable list of all the hook scripts that are attached to the specified hook, in execution order. Changing this list will change the order that scripts run in, and deleting a script will remove it from executing diff --git a/src/py-opentimelineio/opentimelineio/plugins/manifest.py b/src/py-opentimelineio/opentimelineio/plugins/manifest.py index 2da74ed84..87f23abb1 100644 --- a/src/py-opentimelineio/opentimelineio/plugins/manifest.py +++ b/src/py-opentimelineio/opentimelineio/plugins/manifest.py @@ -216,7 +216,7 @@ def schemadef_module_from_name(self, name): def load_manifest(): - """ Walk the plugin manifest discovery systems and accumulate manifests. + """Walk the plugin manifest discovery systems and accumulate manifests. The order of loading (and precedence) is: diff --git a/src/py-opentimelineio/opentimelineio/schema/track.py b/src/py-opentimelineio/opentimelineio/schema/track.py index c98dee2d2..c5e7fdb5f 100644 --- a/src/py-opentimelineio/opentimelineio/schema/track.py +++ b/src/py-opentimelineio/opentimelineio/schema/track.py @@ -7,7 +7,7 @@ @add_method(_otio.Track) def each_clip(self, search_range=None, shallow_search=False): - """ Generator that returns each clip contained in the track + """Generator that returns each clip contained in the track in the order in which it is found. .. deprecated:: 0.14.0 diff --git a/src/py-opentimelineio/opentimelineio/url_utils.py b/src/py-opentimelineio/opentimelineio/url_utils.py index f8e18c81b..b6b56221e 100644 --- a/src/py-opentimelineio/opentimelineio/url_utils.py +++ b/src/py-opentimelineio/opentimelineio/url_utils.py @@ -21,7 +21,7 @@ def url_from_filepath(fpath): - """convert a filesystem path to an url in a portable way using / path sep""" + """Convert a filesystem path to an url in a portable way using / path sep""" try: # appears to handle absolute windows paths better, which are absolute