Loading django/contrib/admin/tests.py +4 −4 Original line number Diff line number Diff line Loading @@ -54,7 +54,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): def wait_for(self, css_selector, timeout=10): """ Helper function that blocks until an css selector is found on the page. Helper function that blocks until a CSS selector is found on the page. """ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec Loading @@ -65,7 +65,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): def wait_for_text(self, css_selector, text, timeout=10): """ Helper function that blocks until the text is found in the css selector. Helper function that blocks until the text is found in the CSS selector. """ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec Loading @@ -77,7 +77,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): def wait_for_value(self, css_selector, text, timeout=10): """ Helper function that blocks until the value is found in the css selector. Helper function that blocks until the value is found in the CSS selector. """ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec Loading @@ -96,7 +96,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): # Wait for the next page to be loaded self.wait_loaded_tag('body') except TimeoutException: # IE7 occasionnally returns an error "Internet Explorer cannot # IE7 occasionally returns an error "Internet Explorer cannot # display the webpage" and doesn't load the next page. We just # ignore it. pass Loading django/contrib/admin/utils.py +1 −1 Original line number Diff line number Diff line Loading @@ -108,7 +108,7 @@ def flatten_fieldsets(fieldsets): def get_deleted_objects(objs, opts, user, admin_site, using): """ Find all objects related to ``objs`` that should also be deleted. ``objs`` must be a homogenous iterable of objects (e.g. a QuerySet). must be a homogeneous iterable of objects (e.g. a QuerySet). Returns a nested list of strings suitable for display in the template with the ``unordered_list`` filter. Loading django/contrib/auth/decorators.py +1 −1 Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ def login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login def permission_required(perm, login_url=None, raise_exception=False): """ Decorator for views that checks whether a user has a particular permission enabled, redirecting to the log-in page if neccesary. enabled, redirecting to the log-in page if necessary. If the raise_exception parameter is given the PermissionDenied exception is raised. """ Loading django/contrib/auth/hashers.py +1 −1 Original line number Diff line number Diff line Loading @@ -186,7 +186,7 @@ class BasePasswordHasher(object): def salt(self): """ Generates a cryptographically secure nonce salt in ascii Generates a cryptographically secure nonce salt in ASCII """ return get_random_string() Loading django/contrib/auth/tests/test_management.py +1 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ def mock_inputs(inputs): def mock_input(prompt): # prompt should be encoded in Python 2. This line will raise an # Exception if prompt contains unencoded non-ascii on Python 2. # Exception if prompt contains unencoded non-ASCII on Python 2. prompt = str(prompt) assert str('__proxy__') not in prompt response = '' Loading Loading
django/contrib/admin/tests.py +4 −4 Original line number Diff line number Diff line Loading @@ -54,7 +54,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): def wait_for(self, css_selector, timeout=10): """ Helper function that blocks until an css selector is found on the page. Helper function that blocks until a CSS selector is found on the page. """ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec Loading @@ -65,7 +65,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): def wait_for_text(self, css_selector, text, timeout=10): """ Helper function that blocks until the text is found in the css selector. Helper function that blocks until the text is found in the CSS selector. """ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec Loading @@ -77,7 +77,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): def wait_for_value(self, css_selector, text, timeout=10): """ Helper function that blocks until the value is found in the css selector. Helper function that blocks until the value is found in the CSS selector. """ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as ec Loading @@ -96,7 +96,7 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): # Wait for the next page to be loaded self.wait_loaded_tag('body') except TimeoutException: # IE7 occasionnally returns an error "Internet Explorer cannot # IE7 occasionally returns an error "Internet Explorer cannot # display the webpage" and doesn't load the next page. We just # ignore it. pass Loading
django/contrib/admin/utils.py +1 −1 Original line number Diff line number Diff line Loading @@ -108,7 +108,7 @@ def flatten_fieldsets(fieldsets): def get_deleted_objects(objs, opts, user, admin_site, using): """ Find all objects related to ``objs`` that should also be deleted. ``objs`` must be a homogenous iterable of objects (e.g. a QuerySet). must be a homogeneous iterable of objects (e.g. a QuerySet). Returns a nested list of strings suitable for display in the template with the ``unordered_list`` filter. Loading
django/contrib/auth/decorators.py +1 −1 Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ def login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login def permission_required(perm, login_url=None, raise_exception=False): """ Decorator for views that checks whether a user has a particular permission enabled, redirecting to the log-in page if neccesary. enabled, redirecting to the log-in page if necessary. If the raise_exception parameter is given the PermissionDenied exception is raised. """ Loading
django/contrib/auth/hashers.py +1 −1 Original line number Diff line number Diff line Loading @@ -186,7 +186,7 @@ class BasePasswordHasher(object): def salt(self): """ Generates a cryptographically secure nonce salt in ascii Generates a cryptographically secure nonce salt in ASCII """ return get_random_string() Loading
django/contrib/auth/tests/test_management.py +1 −1 Original line number Diff line number Diff line Loading @@ -39,7 +39,7 @@ def mock_inputs(inputs): def mock_input(prompt): # prompt should be encoded in Python 2. This line will raise an # Exception if prompt contains unencoded non-ascii on Python 2. # Exception if prompt contains unencoded non-ASCII on Python 2. prompt = str(prompt) assert str('__proxy__') not in prompt response = '' Loading