python3: encoding variations in test_role_manager
This commit is contained in:
parent
66139045e2
commit
c471f4cedd
|
@ -13,6 +13,9 @@
|
|||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
from django.utils.encoding import force_bytes
|
||||
from django.utils.encoding import force_text
|
||||
|
||||
from utils import login
|
||||
|
||||
|
||||
|
@ -29,7 +32,7 @@ def test_manager_role_export(app, admin, ou1, role_ou1, ou2, role_ou2):
|
|||
assert set([role['slug'] for role in export['roles']]) == set(['role_ou1', 'role_ou2'])
|
||||
|
||||
export_response = response.click('CSV')
|
||||
reader = csv.reader(export_response.body.split('\r\n'), delimiter=',')
|
||||
reader = csv.reader([force_text(line) for line in export_response.body.split(force_bytes('\r\n'))], delimiter=',')
|
||||
rows = [row for row in reader]
|
||||
|
||||
assert rows[0] == ['name', 'slug', 'members']
|
||||
|
@ -47,7 +50,7 @@ def test_manager_role_export(app, admin, ou1, role_ou1, ou2, role_ou2):
|
|||
assert export['roles'][0]['slug'] == 'role_ou1'
|
||||
|
||||
export_response = search_response.click('CSV')
|
||||
reader = csv.reader(export_response.body.split('\r\n'), delimiter=',')
|
||||
reader = csv.reader([force_text(line) for line in export_response.body.split(force_bytes('\r\n'))], delimiter=',')
|
||||
rows = [row for row in reader]
|
||||
|
||||
assert rows[0] == ['name', 'slug', 'members']
|
||||
|
|
Loading…
Reference in New Issue