More import path fixes from Henrik

- Legacy-Id: 3877

ietf/doc/proxy.py

@@ -36,7 +36,7 @@ class InternetDraft(Document):
     #group = models.ForeignKey(Acronym, db_column='group_acronym_id')
     @property
     def group(self):
-        from group.proxy import Acronym as AcronymProxy
+        from ietf.group.proxy import Acronym as AcronymProxy
         g = super(InternetDraft, self).group
         return AcronymProxy().from_object(g) if g else None
     #filename = models.CharField(max_length=255, unique=True)
@@ -365,13 +365,13 @@ class InternetDraft(Document):
     @property
     def mark_by(self):
         e = self.latest_event()
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e else None
 
     # job_owner = models.ForeignKey(IESGLogin, db_column='job_owner', related_name='documents')
     @property
     def job_owner(self):
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(self.ad) if self.ad else None
     
     #event_date = models.DateField(null=True)
@@ -383,7 +383,7 @@ class InternetDraft(Document):
     #area_acronym = models.ForeignKey(Area)
     @property
     def area_acronym(self):
-        from group.proxy import Area
+        from ietf.group.proxy import Area
         g = super(InternetDraft, self).group # be careful with group which is proxied
         if g and g.type_id != "individ":
             return Area().from_object(g.parent)
@@ -462,7 +462,7 @@ class InternetDraft(Document):
     @property
     def resurrect_requested_by(self):
         e = self.latest_event(type__in=("requested_resurrect", "completed_resurrect"))
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e and e.type == "requested_resurrect" else None
     
     #approved_in_minute = models.IntegerField(null=True, blank=True)
@@ -522,7 +522,7 @@ class InternetDraft(Document):
     @property
     def an_sent_by(self):
         e = self.latest_event(type="iesg_approved")
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e else None
 
     #defer = models.BooleanField()
@@ -535,7 +535,7 @@ class InternetDraft(Document):
     @property
     def defer_by(self):
         e = self.latest_event(type="changed_document", desc__startswith="State changed to <b>IESG Evaluation - Defer</b>")
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         return IESGLoginProxy().from_object(e.by) if e else None
     
     #defer_date = models.DateField(null=True, blank=True)
@@ -572,7 +572,7 @@ class InternetDraft(Document):
     #     return remarks
     def active_positions(self):
         """Returns a list of dicts, with AD and Position tuples"""
-        from person.proxy import IESGLogin as IESGLoginProxy
+        from ietf.person.proxy import IESGLogin as IESGLoginProxy
         from ietf.doc.utils import active_ballot_positions
 
         res = []
@@ -892,7 +892,7 @@ class DraftLikeDocAlias(DocAlias):
 
     @property
     def ipr(self):
-        from ipr.models import IprDraftProxy
+        from ietf.ipr.models import IprDraftProxy
         return IprDraftProxy.objects.filter(doc_alias=self.pk)
     
     class Meta:

ietf/group/proxy.py

@@ -138,7 +138,7 @@ class IETFWG(Group):
     #meeting_scheduled = models.CharField(blank=True, max_length=3)
     @property
     def meeting_scheduled(self):
-        from meeting.models import Meeting
+        from ietf.meeting.models import Meeting
         latest_meeting = Meeting.objects.order_by('-date')[0]
         return "YES" if self.session_set.filter(meeting=latest_meeting) else "NO"
     #email_address = models.CharField(blank=True, max_length=60)

ietf/idrfc/generate_fixtures.py

@@ -14,8 +14,8 @@ setup_environ(settings)
 # script
 from django.core.serializers import serialize
 from django.db.models import Q 
-from idtracker.models import *
-from iesg.models import *
+from ietf.idtracker.models import *
+from ietf.iesg.models import *
 
 def output(name, qs):
     try:

ietf/ietfauth/urls.py

@@ -18,5 +18,4 @@ urlpatterns += patterns('ietf.ietfauth.views',
         url(r'^reset/$', 'password_reset_view', name='password_reset'),
         url(r'^reset/confirm/(?P<username>[\w.@+-]+)/(?P<date>[\d]+)/(?P<realm>[\w]+)/(?P<reset_hash>[a-f0-9]+)/$', 'confirm_password_reset', name='confirm_password_reset'),
         url(r'^ajax/check_username/$', 'ajax_check_username', name='ajax_check_username'),
-
 )

ietf/ipr/views.py

@@ -49,7 +49,7 @@ def list_drafts(request):
                     mimetype="text/plain")
 
 def list_draftsREDESIGN(request):
-    from ipr.models import IprDocAlias
+    from ietf.ipr.models import IprDocAlias
     
     docipr = {}