Fixing some trailing whitespace errors for pep8 compliance

Fork: 0

kalle / postorius

Browse code Fixing some trailing whitespace errors for pep8 compliance master
1 parent f563e68 commit a1cdfa48d350ad156a1473b729b7dc9302aa9071 Terri Oda authored on 13 Apr 2015

Patch

Unified Split

Showing 1 changed file

                Ignore Space
               Show notes
              View
            
          
          10 ■■■■■
          src/postorius/models.py
     objects = AddressConfirmationProfileManager()
 
    def __unicode__(self):
        return u'Address Confirmation Profile for {0}'.format(self.email)
    
 
    @property
    def is_expired(self):
        """
        a profile expires after 1 day by default.
            >>> EMAIL_CONFIRMATION_FROM = 'postmaster@list.org'
            >>> EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed'
 
        :param request: The HTTP request object.
        :type request: HTTPRequest 
        :type request: HTTPRequest
        :param template_context: The context used when rendering the template.
            Falls back to host url and activation link. 
            Falls back to host url and activation link.
        :type template_context: django.template.Context
        """
        # create the host url and the activation link need for the template
        host_url = self._create_host_url(request)
        # Get the url string from url conf.
        url = reverse('address_activation_link',
                      kwargs={'activation_key': self.activation_key})
        activation_link = '{0}{1}'.format(host_url, url)
        # Detect the right template path, either from the param, 
        # Detect the right template path, either from the param,
        # the setting or the default
        if not template_path:
            template_path = getattr(settings,
                                    'EMAIL_CONFIRMATION_TEMPLATE',
        except AttributeError:
            # settings.EMAIL_CONFIRMATION_FROM is not defined, fallback
            # settings.DEFAULT_EMAIL_FROM as mentioned in the django
            # docs. If that also fails, raise a `ImproperlyConfigured` Error.
            try: 
            try:
                sender_address = getattr(settings, 'DEFAULT_FROM_EMAIL')
            except AttributeError:
                raise ImproperlyConfigured
     objects = AddressConfirmationProfileManager()
     def __unicode__(self):
         return u'Address Confirmation Profile for {0}'.format(self.email)
     @property
     def is_expired(self):
         """
         a profile expires after 1 day by default.
             >>> EMAIL_CONFIRMATION_FROM = 'postmaster@list.org'
             >>> EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed'
         :param request: The HTTP request object.
+        :type request: HTTPRequest
+        :type request: HTTPRequest
         :param template_context: The context used when rendering the template.
+            Falls back to host url and activation link.
+            Falls back to host url and activation link.
         :type template_context: django.template.Context
         """
         # create the host url and the activation link need for the template
         host_url = self._create_host_url(request)
         # Get the url string from url conf.
         url = reverse('address_activation_link',
                       kwargs={'activation_key': self.activation_key})
         activation_link = '{0}{1}'.format(host_url, url)
+        # Detect the right template path, either from the param,
+        # Detect the right template path, either from the param,
         # the setting or the default
         if not template_path:
             template_path = getattr(settings,
                                     'EMAIL_CONFIRMATION_TEMPLATE',
         except AttributeError:
             # settings.EMAIL_CONFIRMATION_FROM is not defined, fallback
             # settings.DEFAULT_EMAIL_FROM as mentioned in the django
             # docs. If that also fails, raise a `ImproperlyConfigured` Error.
+            try:
+            try:
                 sender_address = getattr(settings, 'DEFAULT_FROM_EMAIL')
             except AttributeError:
                 raise ImproperlyConfigured

Show line notes below