Merge pull request #51 from adobe-apiplatform/v2

prepare for v2.6 - unicode fixes

Author: adobeDan

HISTORY.md

@@ -100,4 +100,9 @@ Enhancement release:
 * (No Issue)
     * Read the wall clock to return an accurate "total time" in the `UnavailableError` (and associated logging).
 
+### Version 2.6
 
+Bug fix release:
+
+* [Issue 50](https://github.com/adobe-apiplatform/umapi-client.py/issues/50)
+    * Unicode input for email produced error strings that were incorrectly encoded, so clients crashed trying to use them.

umapi_client/functional.py

@@ -77,13 +77,10 @@ def _validate(cls, email=None, username=None, domain=None):
         :param domain: a domain
         '''
         if email and not cls._email_regex.match(email):
-            email = email.encode('utf-8')
             raise ValueError("'%s': Illegal email format (must be ascii, unquoted, with no comment part)" % (email,))
         if domain and not cls._domain_regex.match(domain):
-            domain = domain.encode('utf-8')
             raise ValueError("'%s': Illegal domain format" % (domain,))
         if username and not cls._username_regex.match(username):
-            username = username.encode('utf-8')
             raise ValueError("'%s': Illegal username format (must be unquoted email local part)" % (username,))
 
     def __init__(self, id_type=IdentityTypes.adobeID, email=None, username=None, domain=None, **kwargs):

umapi_client/version.py

@@ -18,4 +18,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__version__ = "2.5.2"
+__version__ = "2.6"