summaryrefslogtreecommitdiffstats
path: root/pym/portage/util
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-03-27 08:52:35 -0700
committerZac Medico <zmedico@gentoo.org>2012-03-27 08:52:35 -0700
commitb2147b15e11b3d30d646098696ef69d749aeb5b2 (patch)
tree87bd634e6a305434351128469ef000ed267ee441 /pym/portage/util
parentae8070542fcee0516fbfa270f6ef3f3e53a8d220 (diff)
downloadportage-b2147b15e11b3d30d646098696ef69d749aeb5b2.tar.gz
portage-b2147b15e11b3d30d646098696ef69d749aeb5b2.tar.bz2
portage-b2147b15e11b3d30d646098696ef69d749aeb5b2.zip
Replace @returns with @return.
Diffstat (limited to 'pym/portage/util')
-rw-r--r--pym/portage/util/ExtractKernelVersion.py2
-rw-r--r--pym/portage/util/__init__.py2
-rw-r--r--pym/portage/util/_dyn_libs/PreservedLibsRegistry.py2
-rw-r--r--pym/portage/util/_eventloop/EventLoop.py2
-rw-r--r--pym/portage/util/_pty.py2
-rw-r--r--pym/portage/util/lafilefixer.py2
-rw-r--r--pym/portage/util/listdir.py2
7 files changed, 7 insertions, 7 deletions
diff --git a/pym/portage/util/ExtractKernelVersion.py b/pym/portage/util/ExtractKernelVersion.py
index 49957f5fb..69bd58a68 100644
--- a/pym/portage/util/ExtractKernelVersion.py
+++ b/pym/portage/util/ExtractKernelVersion.py
@@ -14,7 +14,7 @@ def ExtractKernelVersion(base_dir):
@param base_dir: Path to sources (usually /usr/src/linux)
@type base_dir: string
@rtype: tuple( version[string], error[string])
- @returns:
+ @return:
1. tuple( version[string], error[string])
Either version or error is populated (but never both)
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index 02fb75dfd..dd692a13a 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -346,7 +346,7 @@ def grabdict(myfilename, juststrings=0, empty=0, recursive=0, incremental=1):
@param incremental: Append to the return list, don't overwrite
@type incremental: Boolean (integer)
@rtype: Dictionary
- @returns:
+ @return:
1. Returns the lines in a file in a dictionary, for example:
'sys-apps/portage x86 amd64 ppc'
would return
diff --git a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py
index 26da0cf20..4bc64dbfe 100644
--- a/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py
+++ b/pym/portage/util/_dyn_libs/PreservedLibsRegistry.py
@@ -242,7 +242,7 @@ class PreservedLibsRegistry(object):
def getPreservedLibs(self):
""" Return a mapping of packages->preserved objects.
- @returns mapping of package instances to preserved objects
+ @return mapping of package instances to preserved objects
@rtype Dict cpv->list-of-paths
"""
if self._data is None:
diff --git a/pym/portage/util/_eventloop/EventLoop.py b/pym/portage/util/_eventloop/EventLoop.py
index a2d4cd40b..ef20ce401 100644
--- a/pym/portage/util/_eventloop/EventLoop.py
+++ b/pym/portage/util/_eventloop/EventLoop.py
@@ -435,7 +435,7 @@ def can_poll_device():
Test if it's possible to use poll() on a device such as a pty. This
is known to fail on Darwin.
@rtype: bool
- @returns: True if poll() on a device succeeds, False otherwise.
+ @return: True if poll() on a device succeeds, False otherwise.
"""
global _can_poll_device
diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py
index 95082cf5b..11c8b92af 100644
--- a/pym/portage/util/_pty.py
+++ b/pym/portage/util/_pty.py
@@ -27,7 +27,7 @@ def _create_pty_or_pipe(copy_term_size=None):
then the term size will be copied to the pty.
@type copy_term_size: int
@rtype: tuple
- @returns: A tuple of (is_pty, master_fd, slave_fd) where
+ @return: A tuple of (is_pty, master_fd, slave_fd) where
is_pty is True if a pty was successfully allocated, and
False if a normal pipe was allocated.
"""
diff --git a/pym/portage/util/lafilefixer.py b/pym/portage/util/lafilefixer.py
index 2b093d87b..54ff20de5 100644
--- a/pym/portage/util/lafilefixer.py
+++ b/pym/portage/util/lafilefixer.py
@@ -80,7 +80,7 @@ def rewrite_lafile(contents):
@param contents: the contents of a libtool archive file
@type contents: bytes
@rtype: tuple
- @returns: (True, fixed_contents) if something needed to be
+ @return: (True, fixed_contents) if something needed to be
fixed, (False, None) otherwise.
"""
#Parse the 'dependency_libs' and 'inherited_linker_flags' lines.
diff --git a/pym/portage/util/listdir.py b/pym/portage/util/listdir.py
index 5753d2f97..c2628cbfe 100644
--- a/pym/portage/util/listdir.py
+++ b/pym/portage/util/listdir.py
@@ -109,7 +109,7 @@ def listdir(mypath, recursive=False, filesonly=False, ignorecvs=False, ignorelis
@param dirsonly: Only return directories.
@type dirsonly: Boolean
@rtype: List
- @returns: A list of files and directories (or just files or just directories) or an empty list.
+ @return: A list of files and directories (or just files or just directories) or an empty list.
"""
list, ftype = cacheddir(mypath, ignorecvs, ignorelist, EmptyOnError, followSymlinks)