From 828908623ac1714e9b66de56e6707e399a1aa5b8 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sun, 12 Jul 2015 12:08:28 -0500 Subject: simplify logic, it doesn't appear parts > 2 is possible --- src/cryptography/x509.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py index ca91b07a..8bed79e2 100644 --- a/src/cryptography/x509.py +++ b/src/cryptography/x509.py @@ -906,10 +906,9 @@ class RFC822Name(object): name, address = parseaddr(value) parts = address.split(u"@") - if name or len(parts) > 2 or not address: - # parseaddr has found a name (e.g. Name ) or the split - # has found more than 2 parts (which means more than one @) - # or the entire value is an empty string. + if name or not address: + # parseaddr has found a name (e.g. Name ) or the entire + # value is an empty string. raise ValueError("Invalid rfc822name value") elif len(parts) == 1: # Single label email name. This is valid for local delivery. -- cgit v1.2.3