summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-06-23 18:30:54 +0200
committerIlya Etingof <etingof@gmail.com>2019-06-23 18:30:54 +0200
commite9ab3c4508a7820ce19cf86261c07da0c45b644a (patch)
treed4069eee8b7cc01f25997e567b4a9614a4751174
parent54dfd6246aeb4a63566f449f9df18f434c70a5be (diff)
parentb028644dea4244f1cd2513ab0241c8cb9be43324 (diff)
downloadpyasn1-git-e9ab3c4508a7820ce19cf86261c07da0c45b644a.tar.gz
Merge branch 'master' of github.com:etingof/pyasn1
-rw-r--r--pyasn1/type/constraint.py10
-rw-r--r--pyasn1/type/namedval.py2
2 files changed, 6 insertions, 6 deletions
diff --git a/pyasn1/type/constraint.py b/pyasn1/type/constraint.py
index 9d8883d..656e203 100644
--- a/pyasn1/type/constraint.py
+++ b/pyasn1/type/constraint.py
@@ -107,7 +107,7 @@ class SingleValueConstraint(AbstractConstraint):
Parameters
----------
- \*values: :class:`int`
+ *values: :class:`int`
Full set of values permitted by this constraint object.
Examples
@@ -149,7 +149,7 @@ class ContainedSubtypeConstraint(AbstractConstraint):
Parameters
----------
- \*values:
+ *values:
Full set of values and constraint objects permitted
by this constraint object.
@@ -310,7 +310,7 @@ class PermittedAlphabetConstraint(SingleValueConstraint):
Parameters
----------
- \*alphabet: :class:`str`
+ *alphabet: :class:`str`
Full set of characters permitted by this constraint object.
Examples
@@ -467,7 +467,7 @@ class ConstraintsIntersection(AbstractConstraintSet):
Parameters
----------
- \*constraints:
+ *constraints:
Constraint or logic operator objects.
Examples
@@ -511,7 +511,7 @@ class ConstraintsUnion(AbstractConstraintSet):
Parameters
----------
- \*constraints:
+ *constraints:
Constraint or logic operator objects.
Examples
diff --git a/pyasn1/type/namedval.py b/pyasn1/type/namedval.py
index 2233aaf..40468d4 100644
--- a/pyasn1/type/namedval.py
+++ b/pyasn1/type/namedval.py
@@ -23,7 +23,7 @@ class NamedValues(object):
Parameters
----------
- \*args: variable number of two-element :py:class:`tuple`
+ *args: variable number of two-element :py:class:`tuple`
name: :py:class:`str`
Value label