Fix #58 - '?' not ok in filenames on windows

lcosmin · Jun 12, 2019 · 504f56c · 504f56c
1 parent 457ff50
commit 504f56c
Show file tree

Hide file tree

Showing 65 changed files with 3 additions and 2 deletions.
diff --git a/test/_common.py b/test/_common.py
@@ -103,20 +103,21 @@ def simulate_bgg(url, params, timeout):
     sorted_params = sorted(params.items(), key=lambda t: t[0])
     query_string = '&'.join([str(k) + "=" + str(v) for k, v in sorted_params])
 
-    filename = os.path.join(XML_PATH, fragment + "?" + query_string)
+    filename = os.path.join(XML_PATH, fragment + "@" + query_string)
 
     with io.open(filename, "r", encoding="utf-8") as xmlfile:
         response_text = xmlfile.read()
 
     return MockResponse(response_text)
 
+
 def simulate_legacy_bgg(url, params, timeout):
     fragment = re.search(r"(?:/)([^/]*/[^/]*)$", url).group(1).replace('/', '%25')
 
     if len(params)>0:
         sorted_params = sorted(params.items(), key=lambda t: t[0])
         query_string = '&'.join([str(k) + "=" + str(v) for k, v in sorted_params])
-        fragment = fragment + "?" + query_string
+        fragment = fragment + "@" + query_string
 
     xml_filename = os.path.join(XML_PATH, fragment)
     with io.open(xml_filename, "r", encoding="utf-8") as xmlfile:

diff --git a/...e=boardgame&username=fagentu007&version=0 → ...e=boardgame&username=fagentu007&version=0 b/...e=boardgame&username=fagentu007&version=0 → ...e=boardgame&username=fagentu007&version=0
diff --git a/...e=boardgame&username=fagentu007&version=1 → ...e=boardgame&username=fagentu007&version=1 b/...e=boardgame&username=fagentu007&version=1 → ...e=boardgame&username=fagentu007&version=1
diff --git a/...pefullyWontExistPlsGuysDontCreateThisUser → ...pefullyWontExistPlsGuysDontCreateThisUser b/...pefullyWontExistPlsGuysDontCreateThisUser → ...pefullyWontExistPlsGuysDontCreateThisUser
diff --git a/test/xml/geeklist%251?comments=1 → test/xml/geeklist%251@comments=1 b/test/xml/geeklist%251?comments=1 → test/xml/geeklist%251@comments=1
diff --git a/test/xml/guild?id=0&members=1 → test/xml/guild@id=0&members=1 b/test/xml/guild?id=0&members=1 → test/xml/guild@id=0&members=1
diff --git a/test/xml/guild?id=1229&members=0 → test/xml/guild@id=1229&members=0 b/test/xml/guild?id=1229&members=0 → test/xml/guild@id=1229&members=0
diff --git a/test/xml/guild?id=1229&members=1 → test/xml/guild@id=1229&members=1 b/test/xml/guild?id=1229&members=1 → test/xml/guild@id=1229&members=1
diff --git a/test/xml/guild?id=1229&members=1&page=10 → test/xml/guild@id=1229&members=1&page=10 b/test/xml/guild?id=1229&members=1&page=10 → test/xml/guild@id=1229&members=1&page=10
diff --git a/test/xml/guild?id=1229&members=1&page=11 → test/xml/guild@id=1229&members=1&page=11 b/test/xml/guild?id=1229&members=1&page=11 → test/xml/guild@id=1229&members=1&page=11
diff --git a/test/xml/guild?id=1229&members=1&page=12 → test/xml/guild@id=1229&members=1&page=12 b/test/xml/guild?id=1229&members=1&page=12 → test/xml/guild@id=1229&members=1&page=12
diff --git a/test/xml/guild?id=1229&members=1&page=13 → test/xml/guild@id=1229&members=1&page=13 b/test/xml/guild?id=1229&members=1&page=13 → test/xml/guild@id=1229&members=1&page=13
diff --git a/test/xml/guild?id=1229&members=1&page=14 → test/xml/guild@id=1229&members=1&page=14 b/test/xml/guild?id=1229&members=1&page=14 → test/xml/guild@id=1229&members=1&page=14
diff --git a/test/xml/guild?id=1229&members=1&page=15 → test/xml/guild@id=1229&members=1&page=15 b/test/xml/guild?id=1229&members=1&page=15 → test/xml/guild@id=1229&members=1&page=15
diff --git a/test/xml/guild?id=1229&members=1&page=16 → test/xml/guild@id=1229&members=1&page=16 b/test/xml/guild?id=1229&members=1&page=16 → test/xml/guild@id=1229&members=1&page=16
diff --git a/test/xml/guild?id=1229&members=1&page=17 → test/xml/guild@id=1229&members=1&page=17 b/test/xml/guild?id=1229&members=1&page=17 → test/xml/guild@id=1229&members=1&page=17
diff --git a/test/xml/guild?id=1229&members=1&page=18 → test/xml/guild@id=1229&members=1&page=18 b/test/xml/guild?id=1229&members=1&page=18 → test/xml/guild@id=1229&members=1&page=18
diff --git a/test/xml/guild?id=1229&members=1&page=19 → test/xml/guild@id=1229&members=1&page=19 b/test/xml/guild?id=1229&members=1&page=19 → test/xml/guild@id=1229&members=1&page=19
diff --git a/test/xml/guild?id=1229&members=1&page=2 → test/xml/guild@id=1229&members=1&page=2 b/test/xml/guild?id=1229&members=1&page=2 → test/xml/guild@id=1229&members=1&page=2
diff --git a/test/xml/guild?id=1229&members=1&page=20 → test/xml/guild@id=1229&members=1&page=20 b/test/xml/guild?id=1229&members=1&page=20 → test/xml/guild@id=1229&members=1&page=20
diff --git a/test/xml/guild?id=1229&members=1&page=3 → test/xml/guild@id=1229&members=1&page=3 b/test/xml/guild?id=1229&members=1&page=3 → test/xml/guild@id=1229&members=1&page=3
diff --git a/test/xml/guild?id=1229&members=1&page=4 → test/xml/guild@id=1229&members=1&page=4 b/test/xml/guild?id=1229&members=1&page=4 → test/xml/guild@id=1229&members=1&page=4
diff --git a/test/xml/guild?id=1229&members=1&page=5 → test/xml/guild@id=1229&members=1&page=5 b/test/xml/guild?id=1229&members=1&page=5 → test/xml/guild@id=1229&members=1&page=5
diff --git a/test/xml/guild?id=1229&members=1&page=6 → test/xml/guild@id=1229&members=1&page=6 b/test/xml/guild?id=1229&members=1&page=6 → test/xml/guild@id=1229&members=1&page=6
diff --git a/test/xml/guild?id=1229&members=1&page=7 → test/xml/guild@id=1229&members=1&page=7 b/test/xml/guild?id=1229&members=1&page=7 → test/xml/guild@id=1229&members=1&page=7
diff --git a/test/xml/guild?id=1229&members=1&page=8 → test/xml/guild@id=1229&members=1&page=8 b/test/xml/guild?id=1229&members=1&page=8 → test/xml/guild@id=1229&members=1&page=8
diff --git a/test/xml/guild?id=1229&members=1&page=9 → test/xml/guild@id=1229&members=1&page=9 b/test/xml/guild?id=1229&members=1&page=9 → test/xml/guild@id=1229&members=1&page=9
diff --git a/test/xml/guild?id=930&members=1 → test/xml/guild@id=930&members=1 b/test/xml/guild?id=930&members=1 → test/xml/guild@id=930&members=1
diff --git a/test/xml/guild?id=930&members=1&page=2 → test/xml/guild@id=930&members=1&page=2 b/test/xml/guild?id=930&members=1&page=2 → test/xml/guild@id=930&members=1&page=2
diff --git a/test/xml/hot?type=boardgame → test/xml/hot@type=boardgame b/test/xml/hot?type=boardgame → test/xml/hot@type=boardgame
diff --git a/test/xml/hot?type=boardgameperson → test/xml/hot@type=boardgameperson b/test/xml/hot?type=boardgameperson → test/xml/hot@type=boardgameperson
diff --git a/...xml/plays?id=1928391829&subtype=boardgame → ...xml/plays@id=1928391829&subtype=boardgame b/...xml/plays?id=1928391829&subtype=boardgame → ...xml/plays@id=1928391829&subtype=boardgame
diff --git a/...xml/plays?id=283&page=2&subtype=boardgame → ...xml/plays@id=283&page=2&subtype=boardgame b/...xml/plays?id=283&page=2&subtype=boardgame → ...xml/plays@id=283&page=2&subtype=boardgame
diff --git a/...xml/plays?id=283&page=3&subtype=boardgame → ...xml/plays@id=283&page=3&subtype=boardgame b/...xml/plays?id=283&page=3&subtype=boardgame → ...xml/plays@id=283&page=3&subtype=boardgame
diff --git a/test/xml/plays?id=283&subtype=boardgame → test/xml/plays@id=283&subtype=boardgame b/test/xml/plays?id=283&subtype=boardgame → test/xml/plays@id=283&subtype=boardgame
diff --git a/...e=2&subtype=boardgame&username=fagentu007 → ...e=2&subtype=boardgame&username=fagentu007 b/...e=2&subtype=boardgame&username=fagentu007 → ...e=2&subtype=boardgame&username=fagentu007
diff --git a/...-01&subtype=boardgame&username=fagentu007 → ...-01&subtype=boardgame&username=fagentu007 b/...-01&subtype=boardgame&username=fagentu007 → ...-01&subtype=boardgame&username=fagentu007
diff --git a/...e=2&subtype=boardgame&username=fagentu007 → ...e=2&subtype=boardgame&username=fagentu007 b/...e=2&subtype=boardgame&username=fagentu007 → ...e=2&subtype=boardgame&username=fagentu007
diff --git a/...ays?subtype=boardgame&username=fagentu007 → ...ays@subtype=boardgame&username=fagentu007 b/...ays?subtype=boardgame&username=fagentu007 → ...ays@subtype=boardgame&username=fagentu007
diff --git a/...pefullyWontExistPlsGuysDontCreateThisUser → ...pefullyWontExistPlsGuysDontCreateThisUser b/...pefullyWontExistPlsGuysDontCreateThisUser → ...pefullyWontExistPlsGuysDontCreateThisUser
diff --git a/...rch?exact=1&query=Agricola&type=boardgame → ...rch@exact=1&query=Agricola&type=boardgame b/...rch?exact=1&query=Agricola&type=boardgame → ...rch@exact=1&query=Agricola&type=boardgame
diff --git a/...=1&query=Twilight Struggle&type=boardgame → ...=1&query=Twilight Struggle&type=boardgame b/...=1&query=Twilight Struggle&type=boardgame → ...=1&query=Twilight Struggle&type=boardgame
diff --git a/...lablathisgamewonteverexist&type=boardgame → ...lablathisgamewonteverexist&type=boardgame b/...lablathisgamewonteverexist&type=boardgame → ...lablathisgamewonteverexist&type=boardgame
diff --git a/...ry=coup&type=boardgame,boardgameexpansion → ...ry=coup&type=boardgame,boardgameexpansion b/...ry=coup&type=boardgame,boardgameexpansion → ...ry=coup&type=boardgame,boardgameexpansion
diff --git a/...arch?exact=1&query=eclipse&type=boardgame → ...arch@exact=1&query=eclipse&type=boardgame b/...arch?exact=1&query=eclipse&type=boardgame → ...arch@exact=1&query=eclipse&type=boardgame
diff --git a/...eclipse&type=boardgame,boardgameexpansion → ...eclipse&type=boardgame,boardgameexpansion b/...eclipse&type=boardgame,boardgameexpansion → ...eclipse&type=boardgame,boardgameexpansion
diff --git a/...ery=some invalid game name&type=boardgame → ...ery=some invalid game name&type=boardgame b/...ery=some invalid game name&type=boardgame → ...ery=some invalid game name&type=boardgame
diff --git a/.../xml/search?query=Agricola&type=boardgame → .../xml/search@query=Agricola&type=boardgame b/.../xml/search?query=Agricola&type=boardgame → .../xml/search@query=Agricola&type=boardgame
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=1&videos=1 → ...ingcomments=0&stats=1&versions=1&videos=1 b/...ingcomments=0&stats=1&versions=1&videos=1 → ...ingcomments=0&stats=1&versions=1&videos=1
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0 b/...ingcomments=0&stats=1&versions=0&videos=0 → ...ingcomments=0&stats=1&versions=0&videos=0
diff --git a/...marketplace=0&stats=1&versions=1&videos=1 → ...marketplace=0&stats=1&versions=1&videos=1 b/...marketplace=0&stats=1&versions=1&videos=1 → ...marketplace=0&stats=1&versions=1&videos=1
diff --git a/...game&guilds=0&hot=0&name=fagentu007&top=0 → ...game&guilds=0&hot=0&name=fagentu007&top=0 b/...game&guilds=0&hot=0&name=fagentu007&top=0 → ...game&guilds=0&hot=0&name=fagentu007&top=0
diff --git a/...ardgame&guilds=1&hot=1&name=Solamar&top=1 → ...ardgame&guilds=1&hot=1&name=Solamar&top=1 b/...ardgame&guilds=1&hot=1&name=Solamar&top=1 → ...ardgame&guilds=1&hot=1&name=Solamar&top=1
diff --git a/...game&guilds=1&hot=1&name=fagentu007&top=1 → ...game&guilds=1&hot=1&name=fagentu007&top=1 b/...game&guilds=1&hot=1&name=fagentu007&top=1 → ...game&guilds=1&hot=1&name=fagentu007&top=1
diff --git a/...yWontExistPlsGuysDontCreateThisUser&top=1 → ...yWontExistPlsGuysDontCreateThisUser&top=1 b/...yWontExistPlsGuysDontCreateThisUser&top=1 → ...yWontExistPlsGuysDontCreateThisUser&top=1