diff options
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/BlockerCache.py | 2 | ||||
-rw-r--r-- | pym/_emerge/CompositeTask.py | 2 | ||||
-rw-r--r-- | pym/_emerge/JobStatusDisplay.py | 2 | ||||
-rw-r--r-- | pym/_emerge/Package.py | 4 | ||||
-rw-r--r-- | pym/_emerge/PollScheduler.py | 2 | ||||
-rw-r--r-- | pym/_emerge/QueueScheduler.py | 2 | ||||
-rw-r--r-- | pym/_emerge/Scheduler.py | 10 | ||||
-rw-r--r-- | pym/_emerge/_flush_elog_mod_echo.py | 2 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 6 | ||||
-rw-r--r-- | pym/_emerge/resolver/output.py | 8 |
10 files changed, 20 insertions, 20 deletions
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index 57e9d2cc5..06598a44e 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -180,7 +180,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping): def __getitem__(self, cpv): """ @rtype: BlockerData - @returns: An object with counter and atoms attributes. + @return: An object with counter and atoms attributes. """ return self.BlockerData(*self._cache_data["blockers"][cpv]) diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index e56188db1..3e434780b 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -104,7 +104,7 @@ class CompositeTask(AsynchronousTask): Subclasses can use this as a generic task exit callback. @rtype: int - @returns: The task.returncode attribute. + @return: The task.returncode attribute. """ self._assert_current(task) if task.returncode != os.EX_OK: diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index d84d1b060..5b9b2216f 100644 --- a/pym/_emerge/JobStatusDisplay.py +++ b/pym/_emerge/JobStatusDisplay.py @@ -97,7 +97,7 @@ class JobStatusDisplay(object): """ Initialize term control codes. @rtype: bool - @returns: True if term codes were successfully initialized, + @return: True if term codes were successfully initialized, False otherwise. """ diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index f87d59312..e4d416c8c 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -491,7 +491,7 @@ class Package(Task): def is_valid_flag(self, flags): """ - @returns: True if all flags are valid USE values which may + @return: True if all flags are valid USE values which may be specified in USE dependencies, False otherwise. """ if isinstance(flags, basestring): @@ -505,7 +505,7 @@ class Package(Task): def get_missing_iuse(self, flags): """ - @returns: A list of flags missing from IUSE. + @return: A list of flags missing from IUSE. """ if isinstance(flags, basestring): flags = [flags] diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 8f0183805..1c631c3f2 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -97,7 +97,7 @@ class PollScheduler(object): def _keep_scheduling(self): """ @rtype: bool - @returns: True if there may be remaining tasks to schedule, + @return: True if there may be remaining tasks to schedule, False otherwise. """ return False diff --git a/pym/_emerge/QueueScheduler.py b/pym/_emerge/QueueScheduler.py index 730bd787d..9d73b7826 100644 --- a/pym/_emerge/QueueScheduler.py +++ b/pym/_emerge/QueueScheduler.py @@ -67,7 +67,7 @@ class QueueScheduler(PollScheduler): def _schedule_tasks(self): """ @rtype: bool - @returns: True if there may be remaining tasks to schedule, + @return: True if there may be remaining tasks to schedule, False otherwise. """ if self._terminated_tasks: diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index bde6cf36c..8d6ab9fb8 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -357,7 +357,7 @@ class Scheduler(PollScheduler): Check if background mode is enabled and adjust states as necessary. @rtype: bool - @returns: True if background mode is enabled, False otherwise. + @return: True if background mode is enabled, False otherwise. """ background = (self._max_jobs is True or \ self._max_jobs > 1 or "--quiet" in self.myopts \ @@ -1435,7 +1435,7 @@ class Scheduler(PollScheduler): merge order @type later: set @rtype: bool - @returns: True if the package is dependent, False otherwise. + @return: True if the package is dependent, False otherwise. """ graph = self._digraph @@ -1535,7 +1535,7 @@ class Scheduler(PollScheduler): def _job_delay(self): """ @rtype: bool - @returns: True if job scheduling should be delayed, False otherwise. + @return: True if job scheduling should be delayed, False otherwise. """ if self._jobs and self._max_load is not None: @@ -1553,7 +1553,7 @@ class Scheduler(PollScheduler): def _schedule_tasks_imp(self): """ @rtype: bool - @returns: True if state changed, False otherwise. + @return: True if state changed, False otherwise. """ state_change = 0 @@ -1710,7 +1710,7 @@ class Scheduler(PollScheduler): Use the current resume list to calculate a new one, dropping any packages with unsatisfied deps. @rtype: bool - @returns: True if successful, False otherwise. + @return: True if successful, False otherwise. """ print(colorize("GOOD", "*** Resuming merge...")) diff --git a/pym/_emerge/_flush_elog_mod_echo.py b/pym/_emerge/_flush_elog_mod_echo.py index eab416880..9ac65b8ae 100644 --- a/pym/_emerge/_flush_elog_mod_echo.py +++ b/pym/_emerge/_flush_elog_mod_echo.py @@ -8,7 +8,7 @@ def _flush_elog_mod_echo(): Dump the mod_echo output now so that our other notifications are shown last. @rtype: bool - @returns: True if messages were shown, False otherwise. + @return: True if messages were shown, False otherwise. """ messages_shown = bool(mod_echo._items) mod_echo.finalize() diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e4310b480..072a5ea6a 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -886,7 +886,7 @@ class depgraph(object): relationships from nested sets @type add_to_digraph: Boolean @rtype: Iterable - @returns: All args given in the input together with additional + @return: All args given in the input together with additional SetArg instances that are generated from nested sets """ @@ -1901,7 +1901,7 @@ class depgraph(object): @param atom_without_category: an atom without a category component @type atom_without_category: String @rtype: list - @returns: a list of atoms containing categories (possibly empty) + @return: a list of atoms containing categories (possibly empty) """ null_cp = portage.dep_getkey(insert_category_into_atom( atom_without_category, "null")) @@ -7029,7 +7029,7 @@ def _resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner): PackageNotFound or depgraph.UnsatisfiedResumeDep when necessary. TODO: Return reasons for dropped_tasks, for display/logging. @rtype: tuple - @returns: (success, depgraph, dropped_tasks) + @return: (success, depgraph, dropped_tasks) """ skip_masked = True skip_unsatisfied = True diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index a97658afb..1208bf99b 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -514,8 +514,8 @@ class Display(object): def _insert_slot(self, pkg, pkg_info, myinslotlist): """Adds slot info to the message - @returns addl: formatted slot info - @returns myoldbest: installed version list + @return addl: formatted slot info + @return myoldbest: installed version list Modifies self.counters.downgrades, self.counters.upgrades, self.counters.binary """ @@ -541,8 +541,8 @@ class Display(object): def _new_slot(self, pkg, pkg_info): """New slot, mark it new. - @returns addl: formatted slot info - @returns myoldbest: installed version list + @return addl: formatted slot info + @return myoldbest: installed version list Modifies self.counters.newslot, self.counters.binary """ addl = " " + green("NS") + pkg_info.fetch_symbol + " " |