@@ -142,8 +142,8 @@ def authorizedLayerAttributes(self, layer, attributes):
142
142
if not self ._active :
143
143
return super (RestrictedAccessControl , self ).authorizedLayerAttributes (layer , attributes )
144
144
145
- if "colour " in attributes : # spellok
146
- attributes .remove ("colour " ) # spellok
145
+ if "color " in attributes : # spellok
146
+ attributes .remove ("color " ) # spellok
147
147
return attributes
148
148
149
149
def allowToEdit (self , layer , feature ):
@@ -169,8 +169,7 @@ def _execute_request(cls, qs, requestMethod=QgsServerRequest.GetMethod, data=Non
169
169
cls ._server .handleRequest (request , response )
170
170
headers = []
171
171
rh = response .headers ()
172
- rk = list (rh .keys ())
173
- rk .sort ()
172
+ rk = sorted (rh .keys ())
174
173
for k in rk :
175
174
headers .append (("%s: %s" % (k , rh [k ])).encode ('utf-8' ))
176
175
return b"\n " .join (headers ) + b"\n \n " , bytes (response .body ())
@@ -250,7 +249,7 @@ def test_wms_getprojectsettings(self):
250
249
str (response ).find ("<TreeName>Country</TreeName>" ) != - 1 ,
251
250
"No Country layer in GetProjectSettings\n %s" % response )
252
251
self .assertTrue (
253
- str (response ).find ("<LayerDrawingOrder>Country_Labels,Country,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>" ) != - 1 ,
252
+ str (response ).find ("<LayerDrawingOrder>Country_Diagrams, Country_Labels,Country,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>" ) != - 1 ,
254
253
"LayerDrawingOrder in GetProjectSettings\n %s" % response )
255
254
256
255
response , headers = self ._get_restricted (query_string )
@@ -261,7 +260,7 @@ def test_wms_getprojectsettings(self):
261
260
str (response ).find ("<TreeName>Country</TreeName>" ) != - 1 ,
262
261
"Country layer in GetProjectSettings\n %s" % response )
263
262
self .assertTrue (
264
- str (response ).find ("<LayerDrawingOrder>Country_Labels,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>" ) != - 1 ,
263
+ str (response ).find ("<LayerDrawingOrder>Country_Diagrams, Country_Labels,dem,Hello_Filter_SubsetString,Hello_Project_SubsetString,Hello_SubsetString,Hello,db_point</LayerDrawingOrder>" ) != - 1 ,
265
264
"LayerDrawingOrder in GetProjectSettings\n %s" % response )
266
265
267
266
def test_wms_getprojectsettings (self ):
@@ -451,18 +450,18 @@ def test_wms_getfeatureinfo_hello(self):
451
450
str (response ).find ("<qgs:pk>1</qgs:pk>" ) != - 1 ,
452
451
"No result in GetFeatureInfo\n %s" % response )
453
452
self .assertTrue (
454
- str (response ).find ("<qgs:colour >red</qgs:colour >" ) != - 1 , # spellok
453
+ str (response ).find ("<qgs:color >red</qgs:color >" ) != - 1 , # spellok
455
454
"No color in result of GetFeatureInfo\n %s" % response )
456
455
457
456
response , headers = self ._get_restricted (query_string )
458
457
self .assertTrue (
459
458
str (response ).find ("<qgs:pk>1</qgs:pk>" ) != - 1 ,
460
459
"No result in GetFeatureInfo\n %s" % response )
461
460
self .assertFalse (
462
- str (response ).find ("<qgs:colour >red</qgs:colour >" ) != - 1 , # spellok
461
+ str (response ).find ("<qgs:color >red</qgs:color >" ) != - 1 , # spellok
463
462
"Unexpected color in result of GetFeatureInfo\n %s" % response )
464
463
self .assertFalse (
465
- str (response ).find ("<qgs:colour >NULL</qgs:colour >" ) != - 1 , # spellok
464
+ str (response ).find ("<qgs:color >NULL</qgs:color >" ) != - 1 , # spellok
466
465
"Unexpected color NULL in result of GetFeatureInfo\n %s" % response )
467
466
468
467
def test_wms_getfeatureinfo_hello2 (self ):
@@ -603,18 +602,18 @@ def test_wfs_getfeature_hello(self):
603
602
str (response ).find ("<qgs:pk>1</qgs:pk>" ) != - 1 ,
604
603
"No result in GetFeature\n %s" % response )
605
604
self .assertTrue (
606
- str (response ).find ("<qgs:colour >red</qgs:colour >" ) != - 1 , # spellok
605
+ str (response ).find ("<qgs:color >red</qgs:color >" ) != - 1 , # spellok
607
606
"No color in result of GetFeature\n %s" % response )
608
607
609
608
response , headers = self ._post_restricted (data )
610
609
self .assertTrue (
611
610
str (response ).find ("<qgs:pk>1</qgs:pk>" ) != - 1 ,
612
611
"No result in GetFeature\n %s" % response )
613
612
self .assertFalse (
614
- str (response ).find ("<qgs:colour >red</qgs:colour >" ) != - 1 , # spellok
613
+ str (response ).find ("<qgs:color >red</qgs:color >" ) != - 1 , # spellok
615
614
"Unexpected color in result of GetFeature\n %s" % response )
616
615
self .assertFalse (
617
- str (response ).find ("<qgs:colour >NULL</qgs:colour >" ) != - 1 , # spellok
616
+ str (response ).find ("<qgs:color >NULL</qgs:color >" ) != - 1 , # spellok
618
617
"Unexpected color NULL in result of GetFeature\n %s" % response )
619
618
620
619
def test_wfs_getfeature_hello2 (self ):
0 commit comments