0001-django22-import-django.urls-51125.patch
passerelle_montpellier_encombrants/models.py | ||
---|---|---|
9 | 9 |
# This program is distributed in the hope that it will be useful, |
10 | 10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | 11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 | 12 |
# GNU Affero General Public License for more details. |
13 | 13 |
# |
14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 |
from django.core.urlresolvers import reverse
|
|
17 |
from django.urls import reverse
|
|
18 | 18 |
from django.db import models |
19 | 19 |
from django.utils import six |
20 | 20 |
from django.utils.translation import ugettext_lazy as _ |
21 | 21 | |
22 | 22 |
from passerelle.base.models import BaseResource |
23 | 23 | |
24 | 24 | |
25 | 25 |
class EncombrantsManagement(BaseResource): |
passerelle_montpellier_encombrants/views.py | ||
---|---|---|
11 | 11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 | 12 |
# GNU Affero General Public License for more details. |
13 | 13 |
# |
14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import datetime |
18 | 18 | |
19 |
from django.core.urlresolvers import reverse, reverse_lazy
|
|
19 |
from django.urls import reverse, reverse_lazy
|
|
20 | 20 |
from django.views.generic import DetailView, ListView |
21 | 21 |
from django.views.generic.base import View |
22 | 22 |
from django.views.generic.detail import SingleObjectMixin |
23 | 23 |
from django.views.generic.edit import CreateView, UpdateView, DeleteView, FormView |
24 | 24 |
from django.db import transaction |
25 | 25 | |
26 | 26 |
from passerelle import utils as passerelle_utils |
27 | 27 |
tests/test_main.py | ||
---|---|---|
2 | 2 | |
3 | 3 |
import json |
4 | 4 |
import datetime |
5 | 5 |
from random import randint |
6 | 6 | |
7 | 7 |
from django.test import TestCase |
8 | 8 |
from django.test.client import Client |
9 | 9 | |
10 |
from django.core.urlresolvers import reverse
|
|
10 |
from django.urls import reverse
|
|
11 | 11 |
from django.utils.encoding import force_text |
12 | 12 | |
13 | 13 |
from passerelle_montpellier_encombrants.models import ( |
14 | 14 |
EncombrantsManagement, |
15 | 15 |
Commune, |
16 | 16 |
Sector, |
17 | 17 |
CollectDay, |
18 | 18 |
Street, |
19 |
- |