Merge commit 'a3f11567d' into dinsic

* commit 'a3f11567d':
  Replace all remaining six usage with native Python 3 equivalents (#7704)

scripts-dev/federation_client.py

@@ -21,8 +21,7 @@ import argparse
 import base64
 import json
 import sys
-
-from six.moves.urllib import parse as urlparse
+from urllib import parse as urlparse
 
 import nacl.signing
 import requests