Convert Epytext markup to RST markup
diff --git a/OpenSSL/test/test_crypto.py b/OpenSSL/test/test_crypto.py
index 5cdcefb..9f16643 100644
--- a/OpenSSL/test/test_crypto.py
+++ b/OpenSSL/test/test_crypto.py
@@ -1888,12 +1888,12 @@
"""
Internal method for quoting a single command-line argument.
- @type: C{str}
- @param s: A single unquoted string to quote for something that is expecting
+ :type: C{str}
+ :param s: A single unquoted string to quote for something that is expecting
cmd.exe-style quoting
- @rtype: C{str}
- @return: A cmd.exe-style quoted string
+ :rtype: C{str}
+ :return: A cmd.exe-style quoted string
@see: U{http://www.perlmonks.org/?node_id=764004}
"""
@@ -1908,11 +1908,11 @@
a similar API. This allows the list passed to C{reactor.spawnProcess} to
match the child process's C{sys.argv} properly.
- @type arguments: C{iterable} of C{str}
- @param arguments: An iterable of unquoted arguments to quote
+ :type arguments: C{iterable} of C{str}
+ :param arguments: An iterable of unquoted arguments to quote
- @rtype: C{str}
- @return: A space-delimited string containing quoted versions of L{arguments}
+ :rtype: C{str}
+ :return: A space-delimited string containing quoted versions of L{arguments}
"""
return ' '.join(map(cmdLineQuote, arguments))
diff --git a/OpenSSL/test/test_ssl.py b/OpenSSL/test/test_ssl.py
index 2ab67fd..f7ce67f 100644
--- a/OpenSSL/test/test_ssl.py
+++ b/OpenSSL/test/test_ssl.py
@@ -1753,7 +1753,7 @@
"""
Verify the return value of the C{get_client_ca_list} method for server and client connections.
- @param func: A function which will be called with the server context
+ :param func: A function which will be called with the server context
before the client and server are connected to each other. This
function should specify a list of CAs for the server to send to the
client and return that same list. The list will be used to verify
diff --git a/OpenSSL/test/util.py b/OpenSSL/test/util.py
index 643fb91..ac9190e 100644
--- a/OpenSSL/test/util.py
+++ b/OpenSSL/test/util.py
@@ -54,10 +54,10 @@
"""
Fail the test if C{containee} is not found in C{container}.
- @param containee: the value that should be in C{container}
- @param container: a sequence type, or in the case of a mapping type,
+ :param containee: the value that should be in C{container}
+ :param container: a sequence type, or in the case of a mapping type,
will follow semantics of 'if key in dict.keys()'
- @param msg: if msg is None, then the failure message will be
+ :param msg: if msg is None, then the failure message will be
'%r not in %r' % (first, second)
"""
if containee not in container:
@@ -72,7 +72,7 @@
obect-identity-equality test, not an object equality
(i.e. C{__eq__}) test.
- @param msg: if msg is None, then the failure message will be
+ :param msg: if msg is None, then the failure message will be
'%r is not %r' % (first, second)
"""
if first is not second:
@@ -87,7 +87,7 @@
obect-identity-equality test, not an object equality
(i.e. C{__eq__}) test.
- @param msg: if msg is None, then the failure message will be
+ :param msg: if msg is None, then the failure message will be
'%r is %r' % (first, second)
"""
if first is second:
@@ -102,11 +102,11 @@
C{args} and C{kwargs} raises C{exception}. The failure will report
the traceback and call stack of the unexpected exception.
- @param exception: exception type that is to be expected
- @param f: the function to call
+ :param exception: exception type that is to be expected
+ :param f: the function to call
- @return: The raised exception instance, if it is of the given type.
- @raise self.failureException: Raised if the function call does
+ :return: The raised exception instance, if it is of the given type.
+ :raise self.failureException: Raised if the function call does
not raise an exception or if it raises an exception of a
different type.
"""
@@ -155,9 +155,9 @@
pretty easy to do something wacky. If something about the type is
unusual, an exception will be raised.
- @param theType: The type object about which to make assertions.
- @param name: A string giving the name of the type.
- @param constructionArgs: Positional arguments to use with C{theType} to
+ :param theType: The type object about which to make assertions.
+ :param name: A string giving the name of the type.
+ :param constructionArgs: Positional arguments to use with C{theType} to
create an instance of it.
"""
self.assertEqual(theType.__name__, name)