From 62fef1d0aa535b0ff3c19a8616e290d37e0e1ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Th=C3=A9pot?= Date: Thu, 14 Oct 2010 17:50:46 +0000 Subject: [PATCH] Massive rename from rating and from lib --- src/bv/server/api/carpoolhandlers.py | 4 ++-- src/bv/server/api/ratinghandlers.py | 8 ++++---- src/bv/server/api/talkshandlers.py | 2 +- src/bv/server/carpool/views.py | 2 +- src/bv/server/lib/doctests.py | 2 +- src/bv/server/lib/libcarpool.py | 2 +- src/bv/server/lib/librating.py | 6 +++--- src/bv/server/lib/libtalks.py | 4 ++-- src/bv/server/lib/tests.py | 2 +- .../rating/management/commands/rating-purgealerts.py | 2 +- .../rating/management/commands/rating-sendalerts.py | 2 +- src/bv/server/rating/views.py | 4 ++-- src/bv/server/talks/views.py | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/bv/server/api/carpoolhandlers.py b/src/bv/server/api/carpoolhandlers.py index 603ff1b..3b55359 100644 --- a/src/bv/server/api/carpoolhandlers.py +++ b/src/bv/server/api/carpoolhandlers.py @@ -3,8 +3,8 @@ from piston.utils import validate from bv.server.carpool.models import Trip, TripDemand, TripOffer -from lib import LibCarpool -from lib.exceptions import InvalidUser +from bv.server.lib import LibCarpool +from bv.server.lib.exceptions import InvalidUser from bv.server.carpool.forms import EditTripForm, EditTripOfferOptionsForm, \ EditTripDemandOptionsForm diff --git a/src/bv/server/api/ratinghandlers.py b/src/bv/server/api/ratinghandlers.py index bffe742..ff01a34 100644 --- a/src/bv/server/api/ratinghandlers.py +++ b/src/bv/server/api/ratinghandlers.py @@ -2,11 +2,11 @@ from piston.utils import rc, require_mime, require_extended from piston.utils import validate -from rating.models import Report, TempReport -from rating.forms import ReportForm +from bv.server.rating.models import Report, TempReport +from bv.server.rating.forms import ReportForm -from lib import LibRating -from lib.exceptions import * +from bv.server.lib import LibRating +from bv.server.lib.exceptions import * from django.contrib.gis.geos.geometry import GEOSGeometry from datetime import date diff --git a/src/bv/server/api/talkshandlers.py b/src/bv/server/api/talkshandlers.py index 1de1b77..4655d99 100644 --- a/src/bv/server/api/talkshandlers.py +++ b/src/bv/server/api/talkshandlers.py @@ -2,7 +2,7 @@ from piston.utils import rc, require_mime, require_extended from piston.utils import validate -from lib import LibTalks, exceptions +from bv.server.lib import LibTalks, exceptions from talks.models import Talk, Message from talks.forms import ContactUserForm diff --git a/src/bv/server/carpool/views.py b/src/bv/server/carpool/views.py index 003c8f7..fb767c5 100644 --- a/src/bv/server/carpool/views.py +++ b/src/bv/server/carpool/views.py @@ -33,7 +33,7 @@ from bv.server.utils.fields import FRENCH_DATE_INPUT_FORMATS from bv.server.utils.paginator import PaginatorRender -from lib import LibCarpool +from bv.server.lib import LibCarpool import datetime _TRIP_PG = [25, 50, 100] diff --git a/src/bv/server/lib/doctests.py b/src/bv/server/lib/doctests.py index 09b3857..ceaf551 100644 --- a/src/bv/server/lib/doctests.py +++ b/src/bv/server/lib/doctests.py @@ -1,6 +1,6 @@ r""" >>> from django.contrib.auth.models import User ->>> from lib.libcarpool import LibCarpool +>>> from bv.server.lib.libcarpool import LibCarpool >>> from django.utils.datastructures import MultiValueDict >>> from bv.server.carpool.models import Trip >>> import datetime diff --git a/src/bv/server/lib/libcarpool.py b/src/bv/server/lib/libcarpool.py index abf6026..c39d749 100644 --- a/src/bv/server/lib/libcarpool.py +++ b/src/bv/server/lib/libcarpool.py @@ -23,7 +23,7 @@ # lib import from bv.server.utils.paginator import PaginatorRender -from lib.exceptions import * +from bv.server.lib.exceptions import * __fixtures__ = ['accounts.json','lib_cities.json','lib_trips.json',] diff --git a/src/bv/server/lib/librating.py b/src/bv/server/lib/librating.py index a514195..f865cc6 100644 --- a/src/bv/server/lib/librating.py +++ b/src/bv/server/lib/librating.py @@ -12,12 +12,12 @@ from django.utils.datastructures import SortedDict #ecov import -from rating.forms import ReportForm -from rating.models import TempReport, Report +from bv.server.rating.forms import ReportForm +from bv.server.rating.models import TempReport, Report from bv.server.utils.paginator import PaginatorRender # lib import -from lib.exceptions import * +from bv.server.lib.exceptions import * #__fixtures__ = ['accounts.json','lib_cities.json','lib_trips.json',] diff --git a/src/bv/server/lib/libtalks.py b/src/bv/server/lib/libtalks.py index b6c885f..fe2c999 100644 --- a/src/bv/server/lib/libtalks.py +++ b/src/bv/server/lib/libtalks.py @@ -15,12 +15,12 @@ # ecov imports from bv.server.carpool.models import Trip -from rating.models import TempReport +from bv.server.rating.models import TempReport from talks.models import Talk, Message from talks.forms import ContactUserForm # lib imports -from lib.exceptions import * +from bv.server.lib.exceptions import * class LibTalks: def _get_ordering(self): diff --git a/src/bv/server/lib/tests.py b/src/bv/server/lib/tests.py index 54b40df..071c40a 100644 --- a/src/bv/server/lib/tests.py +++ b/src/bv/server/lib/tests.py @@ -1,7 +1,7 @@ from django.test import _doctest as doctest from django.test.testcases import OutputChecker, DocTestRunner from django.core.management import call_command -from lib import libcarpool +from bv.server.lib import libcarpool def suite(): loader = DoctestLoader() diff --git a/src/bv/server/rating/management/commands/rating-purgealerts.py b/src/bv/server/rating/management/commands/rating-purgealerts.py index 2e30915..1aabadc 100644 --- a/src/bv/server/rating/management/commands/rating-purgealerts.py +++ b/src/bv/server/rating/management/commands/rating-purgealerts.py @@ -2,7 +2,7 @@ # vim: set fileencoding=utf-8 : from bv.server.utils.management import BaseCommand -from rating.models import TempReport +from bv.server.rating.models import TempReport class Command(BaseCommand): help = """Fetch all closed temp evaluations, transform them in real diff --git a/src/bv/server/rating/management/commands/rating-sendalerts.py b/src/bv/server/rating/management/commands/rating-sendalerts.py index d02a3e2..8488552 100644 --- a/src/bv/server/rating/management/commands/rating-sendalerts.py +++ b/src/bv/server/rating/management/commands/rating-sendalerts.py @@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse from bv.server.utils.management import BaseCommand -from rating.models import TempReport +from bv.server.rating.models import TempReport class Command(BaseCommand): script_name = 'send-rating-alerts' diff --git a/src/bv/server/rating/views.py b/src/bv/server/rating/views.py index 8fe5e4a..4f39c9e 100644 --- a/src/bv/server/rating/views.py +++ b/src/bv/server/rating/views.py @@ -8,8 +8,8 @@ from django.utils.datastructures import SortedDict from django.contrib.auth.decorators import login_required -from rating.forms import ReportForm -from rating.models import TempReport, Report +from bv.server.rating.forms import ReportForm +from bv.server.rating.models import TempReport, Report from bv.server.utils.paginator import PaginatorRender import datetime diff --git a/src/bv/server/talks/views.py b/src/bv/server/talks/views.py index 45ae5f8..6e1e212 100644 --- a/src/bv/server/talks/views.py +++ b/src/bv/server/talks/views.py @@ -21,7 +21,7 @@ from bv.server.carpool.models import Trip from talks.models import Talk, Message from talks.forms import ContactUserForm -from rating.models import TempReport +from bv.server.rating.models import TempReport from bv.server.utils.paginator import PaginatorRender _TALK_PG = [10, 20, 50]