Merge pull request #882 from krinsman/step7_3

alphabetize BaseHandler properties

Author: krinsman

nbviewer/providers/base.py

@@ -130,65 +130,70 @@ def redirect_to_login():
                 raise ex
 
     # Properties
+
     @property
-    def pending(self):
-        return self.settings.setdefault('pending', {})
+    def base_url(self):
+        return self.settings['base_url']
 
     @property
-    def formats(self):
-        return self.settings['formats']
+    def binder_base_url(self):
+        return self.settings['binder_base_url']
 
     @property
-    def providers(self):
-        return self.settings['providers']
+    def cache(self):
+        return self.settings['cache']
 
     @property
-    def default_format(self):
-        return self.settings['default_format']
+    def cache_expiry_max(self):
+        return self.settings.setdefault('cache_expiry_max', 120)
 
     @property
-    def config(self):
-        return self.settings['config']
+    def cache_expiry_min(self):
+        return self.settings.setdefault('cache_expiry_min', 60)
 
     @property
     def client(self):
         return self.settings['client']
 
     @property
-    def index(self):
-        return self.settings['index']
+    def config(self):
+        return self.settings['config']
 
     @property
-    def cache(self):
-        return self.settings['cache']
+    def content_security_policy(self):
+        return self.settings['content_security_policy']
 
     @property
-    def cache_expiry_min(self):
-        return self.settings.setdefault('cache_expiry_min', 60)
+    def default_format(self):
+        return self.settings['default_format']
 
     @property
-    def cache_expiry_max(self):
-        return self.settings.setdefault('cache_expiry_max', 120)
+    def formats(self):
+        return self.settings['formats']
 
     @property
-    def rate_limiter(self):
-        return self.settings['rate_limiter']
+    def frontpage_setup(self):
+        return self.settings['frontpage_setup']
 
     @property
-    def pool(self):
-        return self.settings['pool']
+    def hub_api_token(self):
+        return self.settings.get('hub_api_token')
 
     @property
-    def max_cache_uris(self):
-        return self.settings.setdefault('max_cache_uris', set())
+    def hub_api_url(self):
+        return self.settings.get('hub_api_url')
 
     @property
-    def frontpage_setup(self):
-        return self.settings['frontpage_setup']
+    def hub_base_url(self):
+        return self.settings['hub_base_url']
 
     @property
-    def mathjax_url(self):
-        return self.settings['mathjax_url']
+    def hub_cookie_name(self):
+        return 'jupyterhub-services'
+
+    @property
+    def index(self):
+        return self.settings['index']
 
     @property
     def ipywidgets_base_url(self):
@@ -203,12 +208,28 @@ def jupyter_widgets_html_manager_version(self):
         return self.settings['jupyter_widgets_html_manager_version']
 
     @property
-    def content_security_policy(self):
-        return self.settings['content_security_policy']
+    def mathjax_url(self):
+        return self.settings['mathjax_url']
 
     @property
-    def binder_base_url(self):
-        return self.settings['binder_base_url']
+    def max_cache_uris(self):
+        return self.settings.setdefault('max_cache_uris', set())
+
+    @property
+    def pending(self):
+        return self.settings.setdefault('pending', {})
+
+    @property
+    def pool(self):
+        return self.settings['pool']
+
+    @property
+    def providers(self):
+        return self.settings['providers']
+
+    @property
+    def rate_limiter(self):
+        return self.settings['rate_limiter']
 
     @property
     def statsd(self):
@@ -226,26 +247,6 @@ def statsd(self):
             self._statsd = EmptyClass()
             return self._statsd
 
-    @property
-    def base_url(self):
-        return self.settings['base_url']
-
-    @property
-    def hub_api_token(self):
-        return self.settings.get('hub_api_token')
-
-    @property
-    def hub_api_url(self):
-        return self.settings.get('hub_api_url')
-
-    @property
-    def hub_base_url(self):
-        return self.settings['hub_base_url']
-
-    @property
-    def hub_cookie_name(self):
-        return 'jupyterhub-services'
-
     #---------------------------------------------------------------
     # template rendering
     #---------------------------------------------------------------