only use backports.csv on python 2

This commit is contained in:
Andrew Fyfe
2018-03-24 15:32:54 +00:00
parent 3bd365e78c
commit dab91eb149
5 changed files with 23 additions and 6 deletions
@@ -6,14 +6,18 @@ from __future__ import unicode_literals
import sys
from backports import csv
from django.core.management.base import BaseCommand
from django.utils import six
from modoboa.core.extensions import exts_pool
from modoboa.core.models import User
from .... import models
if six.PY2:
from backports import csv
else:
import csv
class ExportCommand(BaseCommand):
"""Command class."""
@@ -8,7 +8,6 @@ import io
import os
import progressbar
from backports import csv
from django.core.management.base import BaseCommand, CommandError
from django.utils import six
@@ -18,6 +17,11 @@ from modoboa.core.extensions import exts_pool
from modoboa.lib.exceptions import Conflict
from .... import signals
if six.PY2:
from backports import csv
else:
import csv
class ImportCommand(BaseCommand):
"""Command class."""
+5 -1
View File
@@ -4,7 +4,6 @@
from __future__ import unicode_literals
from backports import csv
from rfc6266 import build_header
from django.contrib.auth.decorators import (
@@ -19,6 +18,11 @@ from django.utils.translation import ugettext as _
from ..forms import ExportDomainsForm, ExportIdentitiesForm
from ..lib import get_domains, get_identities
if six.PY2:
from backports import csv
else:
import csv
def _export(content, filename):
"""Export a csv file's content
+6 -1
View File
@@ -6,7 +6,6 @@ from __future__ import unicode_literals
import io
from backports import csv
from reversion import revisions as reversion
from django.contrib.auth.decorators import (
@@ -15,6 +14,7 @@ from django.contrib.auth.decorators import (
from django.db import transaction
from django.shortcuts import render
from django.urls import reverse
from django.utils import six
from django.utils.encoding import smart_text
from django.utils.translation import ugettext as _
@@ -22,6 +22,11 @@ from modoboa.lib.exceptions import Conflict, ModoboaException
from .. import signals
from ..forms import ImportDataForm, ImportIdentitiesForm
if six.PY2:
from backports import csv
else:
import csv
@reversion.create_revision()
def importdata(request, formclass=ImportDataForm):
+1 -1
View File
@@ -26,5 +26,5 @@ pytz
requests
rfc6266
lxml
backports.csv
backports.csv; python_version < '3'
chardet