Skip to content

Commit

Permalink
Fix a few typos and cosmetics inconsistencies (AcademySoftwareFoundat…
Browse files Browse the repository at this point in the history
…ion#1416)

Signed-off-by: Mark Reid <[email protected]>
Signed-off-by: Michele Spina <[email protected]>
  • Loading branch information
markreidvfx authored and MichaelPlug committed Aug 5, 2023
1 parent a1c5624 commit 595fd4d
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/opentimelineio/errorStatus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
Expand Down
4 changes: 2 additions & 2 deletions src/opentimelineio/serializableObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -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; }

Expand Down
4 changes: 2 additions & 2 deletions src/opentimelineview/timeline_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CLASS _type_checked(py::object const& rhs, char const* op) {
}
catch (...) {
std::string rhs_type = py::cast<std::string>(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()));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/py-opentimelineio/opentimelineio/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/py-opentimelineio/opentimelineio/plugins/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/py-opentimelineio/opentimelineio/schema/track.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/py-opentimelineio/opentimelineio/url_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 595fd4d

Please sign in to comment.