From a9acdd524857b5c13f58d244442f6a7b4f83ca10 Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <lmazuel@microsoft.com>
Date: Mon, 11 Jul 2016 14:40:48 -0700
Subject: [PATCH] Fix runtime part of #1217 (#1224)

---
 src/client/Python/msrest/msrest/pipeline.py        | 12 ++++++++++++
 src/client/Python/msrest/readme.rst                |  7 +++++++
 src/client/Python/msrest/test/unittest_pipeline.py | 11 +++++++++++
 src/client/Python/msrest/tox.ini                   |  2 +-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/client/Python/msrest/msrest/pipeline.py b/src/client/Python/msrest/msrest/pipeline.py
index a376139a22..04410ec19c 100644
--- a/src/client/Python/msrest/msrest/pipeline.py
+++ b/src/client/Python/msrest/msrest/pipeline.py
@@ -27,6 +27,10 @@
 import functools
 import json
 import logging
+try:
+    from urlparse import urlparse
+except ImportError:
+    from urllib.parse import urlparse
 
 import requests
 from requests.packages.urllib3 import Retry
@@ -195,6 +199,14 @@ def format_parameters(self, params):
 
         :param dict params: A dictionary of parameters.
         """
+        query = urlparse(self.url).query
+        if query:
+            self.url = self.url.partition('?')[0]
+            existing_params = {
+                p[0]: p[-1]
+                for p in [p.partition('=') for p in query.split('&')]
+            }
+            params.update(existing_params)
         query_params = ["{}={}".format(k, v) for k, v in params.items()]
         query = '?' + '&'.join(query_params)
         self.url = self.url + query
diff --git a/src/client/Python/msrest/readme.rst b/src/client/Python/msrest/readme.rst
index 3ddf58e590..214f6f7b5a 100644
--- a/src/client/Python/msrest/readme.rst
+++ b/src/client/Python/msrest/readme.rst
@@ -15,6 +15,13 @@ To install:
 Release History
 ---------------
 
+2016-xx-xx Version xxxxx
+++++++++++++++++++++++++
+
+**Bugfixes**
+
+- Allow url of ClientRequest to have parameters (https://github.com/Azure/autorest/issues/1217)
+
 2016-05-25 Version 0.4.0
 ++++++++++++++++++++++++
 
diff --git a/src/client/Python/msrest/test/unittest_pipeline.py b/src/client/Python/msrest/test/unittest_pipeline.py
index dd757191be..cb5a1e7fb7 100644
--- a/src/client/Python/msrest/test/unittest_pipeline.py
+++ b/src/client/Python/msrest/test/unittest_pipeline.py
@@ -167,6 +167,17 @@ def test_request_data(self):
         self.assertEqual(request.data, json.dumps(data))
         self.assertEqual(request.headers.get('Content-Length'), 17)
 
+    def test_request_url_with_params(self):
+
+        request = ClientRequest()
+        request.url = "a/b/c?t=y"
+        request.format_parameters({'g': 'h'})
+
+        self.assertIn(request.url, [
+            'a/b/c?g=h&t=y',
+            'a/b/c?t=y&g=h'
+        ])
+
 class TestClientResponse(unittest.TestCase):
 
     class Colors(Enum):
diff --git a/src/client/Python/msrest/tox.ini b/src/client/Python/msrest/tox.ini
index 52dff903bb..7939eaafef 100644
--- a/src/client/Python/msrest/tox.ini
+++ b/src/client/Python/msrest/tox.ini
@@ -7,7 +7,7 @@ changedir=test
 commands=
     coverage run -m unittest discover -s . -p unittest*.py -t .. -v
     coverage report --fail-under=40 --omit=unittest*,*.tox*.py
-    flake8 .. --exclude=unittest*.py,doc --statistics
+    flake8 .. --exclude=unittest*.py,doc,env --statistics
 
 [testenv:py27]
 deps=