diff --git a/hamster_gtk/helpers.py b/hamster_gtk/helpers.py index 794b063a..0c4dfac4 100644 --- a/hamster_gtk/helpers.py +++ b/hamster_gtk/helpers.py @@ -187,7 +187,7 @@ def decompose_raw_fact_string(text, raw=False): def get_recent_activities(controller, start, end): """Return a list of all activities logged in facts within the given timeframe.""" # [FIXME] - # This manual sorting within python is of cause less than optimal. We stick + # This manual sorting within python is of course less than optimal. We stick # with it for now as this is just a preliminary workaround helper anyway and # effective sorting will need to be implemented by the storage backend in # ``hamster-lib``. @@ -204,9 +204,9 @@ def serialize_activity(activity, separator='@', none_category='not categorized') Args: activity (Activity): ``Activity`` instance to serialize. separator (str, optional): ``string`` used to separate ``activity.name`` and - ``category.name``. The separator will be omitted if ``none_categoty=''`` and + ``category.name``. The separator will be omitted if ``none_category=''`` and ``activity.category=None``. Defaults to ``@``. - none_category (str, optional): ``string`` to represent the 'lack of a cactegory' for an + none_category (str, optional): ``string`` to represent the 'lack of a category' for an activity instance. Defaults to ``not categorized``. Returns: diff --git a/tests/test_hamster-gtk.py b/tests/test_hamster-gtk.py index 4ac13eea..1e7b8f5a 100755 --- a/tests/test_hamster-gtk.py +++ b/tests/test_hamster-gtk.py @@ -16,7 +16,7 @@ class TestHamsterGTK(object): def test_instantiation(self, config): """ - Make sure class instatiation works as intended. + Make sure class instantiation works as intended. We actually test against a monkeypatched class in order to avoid the config loading machinery as this would access the user data on fs.