@@ -433,16 +433,16 @@ def _test_rgb_8bui_rendering(lbl, tnam, overview, rescale, clip):
433433 lyr .name , tnam , lbl , overview , clip )
434434 compare_images (expected , im )
435435 # no data
436- eq_ (hexlify (im .view (3 , 16 , 1 , 1 ).tostring ()), '00000000' )
437- eq_ (hexlify (im .view (128 , 16 , 1 , 1 ).tostring ()), '00000000' )
438- eq_ (hexlify (im .view (250 , 16 , 1 , 1 ).tostring ()), '00000000' )
439- eq_ (hexlify (im .view (3 , 240 , 1 , 1 ).tostring ()), '00000000' )
440- eq_ (hexlify (im .view (128 , 240 , 1 , 1 ).tostring ()), '00000000' )
441- eq_ (hexlify (im .view (250 , 240 , 1 , 1 ).tostring ()), '00000000' )
436+ eq_ (hexlify (im .view (3 , 16 , 1 , 1 ).tostring ()), b '00000000' )
437+ eq_ (hexlify (im .view (128 , 16 , 1 , 1 ).tostring ()), b '00000000' )
438+ eq_ (hexlify (im .view (250 , 16 , 1 , 1 ).tostring ()), b '00000000' )
439+ eq_ (hexlify (im .view (3 , 240 , 1 , 1 ).tostring ()), b '00000000' )
440+ eq_ (hexlify (im .view (128 , 240 , 1 , 1 ).tostring ()), b '00000000' )
441+ eq_ (hexlify (im .view (250 , 240 , 1 , 1 ).tostring ()), b '00000000' )
442442 # dark brown
443- eq_ (hexlify (im .view (174 , 39 , 1 , 1 ).tostring ()), 'c3a698ff' )
443+ eq_ (hexlify (im .view (174 , 39 , 1 , 1 ).tostring ()), b 'c3a698ff' )
444444 # dark gray
445- eq_ (hexlify (im .view (195 , 132 , 1 , 1 ).tostring ()), '575f62ff' )
445+ eq_ (hexlify (im .view (195 , 132 , 1 , 1 ).tostring ()), b '575f62ff' )
446446 # Now zoom over a portion of the env (1/10)
447447 newenv = mapnik .Box2d (- 12329035.7652168 , 4508926.651484220 ,
448448 - 12328997.49148983 , 4508957.34625536 )
@@ -456,17 +456,17 @@ def _test_rgb_8bui_rendering(lbl, tnam, overview, rescale, clip):
456456 lyr .name , tnam , lbl , overview , clip )
457457 compare_images (expected , im )
458458 # no data
459- eq_ (hexlify (im .view (3 , 16 , 1 , 1 ).tostring ()), '00000000' )
460- eq_ (hexlify (im .view (128 , 16 , 1 , 1 ).tostring ()), '00000000' )
461- eq_ (hexlify (im .view (250 , 16 , 1 , 1 ).tostring ()), '00000000' )
459+ eq_ (hexlify (im .view (3 , 16 , 1 , 1 ).tostring ()), b '00000000' )
460+ eq_ (hexlify (im .view (128 , 16 , 1 , 1 ).tostring ()), b '00000000' )
461+ eq_ (hexlify (im .view (250 , 16 , 1 , 1 ).tostring ()), b '00000000' )
462462 # black
463- eq_ (hexlify (im .view (3 , 42 , 1 , 1 ).tostring ()), '000000ff' )
464- eq_ (hexlify (im .view (3 , 134 , 1 , 1 ).tostring ()), '000000ff' )
465- eq_ (hexlify (im .view (3 , 244 , 1 , 1 ).tostring ()), '000000ff' )
463+ eq_ (hexlify (im .view (3 , 42 , 1 , 1 ).tostring ()), b '000000ff' )
464+ eq_ (hexlify (im .view (3 , 134 , 1 , 1 ).tostring ()), b '000000ff' )
465+ eq_ (hexlify (im .view (3 , 244 , 1 , 1 ).tostring ()), b '000000ff' )
466466 # gray
467- eq_ (hexlify (im .view (135 , 157 , 1 , 1 ).tostring ()), '4e555bff' )
467+ eq_ (hexlify (im .view (135 , 157 , 1 , 1 ).tostring ()), b '4e555bff' )
468468 # brown
469- eq_ (hexlify (im .view (195 , 223 , 1 , 1 ).tostring ()), 'f2cdbaff' )
469+ eq_ (hexlify (im .view (195 , 223 , 1 , 1 ).tostring ()), b 'f2cdbaff' )
470470
471471 def _test_rgb_8bui (lbl , tilesize , constraint , overview ):
472472 tnam = 'nodataedge'
0 commit comments