Correct urlunparse usage with six
@@ -32,7 +32,7 @@ import sys
from six import StringIO
from six.moves import input
-from six.moves.urllib.parse import urlparse
+from six.moves.urllib.parse import urlparse, urlunparse
import console
import editor # for reloading current file
@@ -586,7 +586,7 @@ def git_push(args):
if not pw:
user, pw = console.login_alert('Enter credentials for {0}'.format(netloc), login=user)
host_with_auth='{}:{}@{}'.format(user,pw,netloc)
- url=urlparse.urlunparse(
+ url=urlunparse(
urlparse(result.url)._replace(
netloc=host_with_auth))
porcelain.push(repo.repo.path, url, branch_name, errstream=outstream)
