@@ -580,7 +580,9 @@ def test_should_send_correct_results_to_multiple_client_subscriptions(server):
580580 ret_values = {}
581581 while True :
582582 try :
583- line = q .get_nowait ()
583+ _line = q .get_nowait ()
584+ if isinstance (_line , bytes ):
585+ line = _line .decode ()
584586 line = json .loads (line )
585587 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
586588 except ValueError :
@@ -648,7 +650,9 @@ def test_send_subscription_fail_message_to_client_with_invalid_query(server):
648650 ret_values = {}
649651 while True :
650652 try :
651- line = q .get_nowait ()
653+ _line = q .get_nowait ()
654+ if isinstance (_line , bytes ):
655+ line = _line .decode ()
652656 line = json .loads (line )
653657 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
654658 except ValueError :
@@ -758,7 +762,9 @@ def test_should_setup_the_proper_filters_when_subscribing(server):
758762 ret_values = {}
759763 while True :
760764 try :
761- line = q .get_nowait ()
765+ _line = q .get_nowait ()
766+ if isinstance (_line , bytes ):
767+ line = _line .decode ()
762768 line = json .loads (line )
763769 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
764770 except ValueError :
@@ -828,7 +834,9 @@ def test_correctly_sets_the_context_in_on_subscribe(server):
828834 ret_values = {}
829835 while True :
830836 try :
831- line = q .get_nowait ()
837+ _line = q .get_nowait ()
838+ if isinstance (_line , bytes ):
839+ line = _line .decode ()
832840 line = json .loads (line )
833841 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
834842 except ValueError :
@@ -922,7 +930,9 @@ def test_does_not_send_subscription_data_after_client_unsubscribes(server):
922930 ret_values = {}
923931 while True :
924932 try :
925- line = q .get_nowait ()
933+ _line = q .get_nowait ()
934+ if isinstance (_line , bytes ):
935+ line = _line .decode ()
926936 line = json .loads (line )
927937 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
928938 except ValueError :
@@ -961,7 +971,9 @@ def test_rejects_client_that_does_not_specifiy_a_supported_protocol(server):
961971 ret_values = []
962972 while True :
963973 try :
964- line = q .get_nowait ()
974+ _line = q .get_nowait ()
975+ if isinstance (_line , bytes ):
976+ line = _line .decode ()
965977 line = json .loads (line )
966978 ret_values .append (line )
967979 except ValueError :
@@ -1003,7 +1015,9 @@ def test_rejects_unparsable_message(server):
10031015 ret_values = {}
10041016 while True :
10051017 try :
1006- line = q .get_nowait ()
1018+ _line = q .get_nowait ()
1019+ if isinstance (_line , bytes ):
1020+ line = _line .decode ()
10071021 line = json .loads (line )
10081022 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
10091023 except ValueError :
@@ -1046,7 +1060,9 @@ def test_rejects_nonsense_message(server):
10461060 ret_values = {}
10471061 while True :
10481062 try :
1049- line = q .get_nowait ()
1063+ _line = q .get_nowait ()
1064+ if isinstance (_line , bytes ):
1065+ line = _line .decode ()
10501066 line = json .loads (line )
10511067 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
10521068 except ValueError :
@@ -1141,7 +1157,9 @@ def test_sends_back_any_type_of_error(server):
11411157 ret_values = {}
11421158 while True :
11431159 try :
1144- line = q .get_nowait ()
1160+ _line = q .get_nowait ()
1161+ if isinstance (_line , bytes ):
1162+ line = _line .decode ()
11451163 line = json .loads (line )
11461164 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
11471165 except ValueError :
@@ -1194,7 +1212,9 @@ def test_handles_errors_prior_to_graphql_execution(server_with_on_sub_handler):
11941212 ret_values = {}
11951213 while True :
11961214 try :
1197- line = q .get_nowait ()
1215+ _line = q .get_nowait ()
1216+ if isinstance (_line , bytes ):
1217+ line = _line .decode ()
11981218 line = json .loads (line )
11991219 ret_values [list (line .keys ())[0 ]] = line [list (line .keys ())[0 ]]
12001220 except ValueError :
@@ -1241,7 +1261,9 @@ def test_sends_a_keep_alive_signal_in_the_socket(server_with_keep_alive):
12411261 time .sleep (.5 )
12421262 while True :
12431263 try :
1244- line = q .get_nowait ()
1264+ _line = q .get_nowait ()
1265+ if isinstance (_line , bytes ):
1266+ line = _line .decode ()
12451267 ret_value = json .loads (line )
12461268 except ValueError :
12471269 pass
0 commit comments