Query string ordering

httpretty/compat.py

@@ -58,10 +58,14 @@ def __repr__(self):
  from urllib.parse import quote
  from urllib.parse import quote_plus
  from urllib.parse import unquote
+ from urllib.parse import urlencode
  unquote_utf8 = unquote
+
+ def encode_obj(in_obj):
+ return in_obj
 except ImportError: # pragma: no cover
  from urlparse import urlsplit, urlunsplit, parse_qs, unquote
- from urllib import quote, quote_plus
+ from urllib import quote, quote_plus, urlencode
 
  def unquote_utf8(qs):
  if isinstance(qs, text_type):
@@ -72,6 +76,31 @@ def unquote_utf8(qs):
  else:
  return s
 
+ def encode_obj(in_obj):
+
+ def encode_list(in_list):
+ out_list = []
+ for el in in_list:
+ out_list.append(encode_obj(el))
+ return out_list
+
+ def encode_dict(in_dict):
+ out_dict = {}
+ for k, v in in_dict.iteritems():
+ out_dict[k] = encode_obj(v)
+ return out_dict
+
+ if isinstance(in_obj, unicode):
+ return in_obj.encode('utf-8')
+ elif isinstance(in_obj, list):
+ return encode_list(in_obj)
+ elif isinstance(in_obj, tuple):
+ return tuple(encode_list(in_obj))
+ elif isinstance(in_obj, dict):
+ return encode_dict(in_obj)
+
+ return in_obj
+
 
 try: # pragma: no cover
  from http.server import BaseHTTPRequestHandler
@@ -93,6 +122,7 @@ def unquote_utf8(qs):
  'BaseHTTPRequestHandler',
  'quote',
  'quote_plus',
+ 'urlencode',
  'urlunsplit',
  'urlsplit',
  'parse_qs',

httpretty/core.py

@@ -50,6 +50,8 @@
  BaseHTTPRequestHandler,
  quote,
  quote_plus,
+ urlencode,
+ encode_obj,
  urlunsplit,
  urlsplit,
  parse_qs,
@@ -882,7 +884,14 @@ def __init__(self,
 
  self.port = port or 80
  self.path = path or ''
- self.query = query or ''
+ if query:
+ query_items = sorted(parse_qs(query).items())
+ self.query = urlencode(
+ encode_obj(query_items),
+ doseq=True,
+ )
+ else:
+ self.query = ''
  if scheme:
  self.scheme = scheme
  elif self.port in POTENTIAL_HTTPS_PORTS:

tests/unit/test_core.py

@@ -624,6 +624,14 @@ def test_URIMatcher_respects_querystring():
  info = URIInfo.from_uri('http://www.foo.com/?query=true', None)
  assert matcher.matches(info)
 
+ matcher = URIMatcher('http://www.foo.com/?query=true&unquery=false', None, match_querystring=True)
+ info = URIInfo.from_uri('http://www.foo.com/?unquery=false&query=true', None)
+ assert matcher.matches(info)
+
+ matcher = URIMatcher('http://www.foo.com/?unquery=false&query=true', None, match_querystring=True)
+ info = URIInfo.from_uri('http://www.foo.com/?query=true&unquery=false', None)
+ assert matcher.matches(info)
+
 
 def test_URIMatcher_equality_respects_querystring():
  ("URIMatcher equality check should check querystring")
@@ -642,3 +650,7 @@ def test_URIMatcher_equality_respects_querystring():
  matcher_a = URIMatcher('http://www.foo.com/?query=true', None, match_querystring=True)
  matcher_b = URIMatcher('http://www.foo.com/', None, match_querystring=True)
  assert not matcher_a == matcher_b
+
+ matcher_a = URIMatcher('http://www.foo.com/?query=true&unquery=false', None, match_querystring=True)
+ matcher_b = URIMatcher('http://www.foo.com/?unquery=false&query=true', None, match_querystring=True)
+ assert matcher_a == matcher_b

tests/unit/test_httpretty.py

@@ -208,7 +208,7 @@ def test_uri_info_full_url():
  )
 
  expect(uri_info.full_url()).to.equal(
- "http://johhny:password@google.com/?foo=bar&baz=test"
+ "http://johhny:password@google.com/?baz=test&foo=bar"
  )
 
  expect(uri_info.full_url(use_querystring=False)).to.equal(