gistfile1.txt

 def unquote_user_host(user_hostname):
     unquoted = unquote(user_hostname)
     if '@' not in unquoted:
-        return unquoted, '%'
-    if unquoted.endswith('@'):
-        return unquoted, '%'
-    splitup = unquoted.split('@')
-    host = splitup[-1]
-    user = '@'.join(splitup[:-1])
+        user, host = unquoted, '%'
+    elif unquoted.endswith('@'):
+        user, host = unquoted, '%'
+    else:
+        splitup = unquoted.split('@')
+        host = splitup[-1]
+        user = '@'.join(splitup[:-1])
+    # un-escape
+    user = user.replace("\\.", ".")
+    host = host.replace("\\.", ".")
     return user, host