limit_window -> rate_limit_window

Author: jdfreder

notebook/notebookapp.py

@@ -191,7 +191,7 @@ def init_settings(self, ipython_app, kernel_manager, contents_manager,
             # rate limits
             iopub_msg_rate_limit=ipython_app.iopub_msg_rate_limit,
             iopub_data_rate_limit=ipython_app.iopub_data_rate_limit,
-            limit_window=ipython_app.limit_window,
+            rate_limit_window=ipython_app.rate_limit_window,
 
             # authentication
             cookie_secret=ipython_app.cookie_secret,
@@ -798,7 +798,7 @@ def _notebook_dir_changed(self, name, old, new):
         Maximum rate at which messages can be sent on iopub before they are
         limited.""")
 
-    limit_window = Float(1.0, config=True, help="""(sec) Time window used to 
+    rate_limit_window = Float(1.0, config=True, help="""(sec) Time window used to 
         check the message and data rate limits.""")
 
     def parse_command_line(self, argv=None):

notebook/services/kernels/handlers.py

@@ -110,8 +110,8 @@ def iopub_data_rate_limit(self):
         return self.settings.get('iopub_data_rate_limit', None)
 
     @property
-    def limit_window(self):
-        return self.settings.get('limit_window', 1.0)
+    def rate_limit_window(self):
+        return self.settings.get('rate_limit_window', 1.0)
 
     def __repr__(self):
         return "%s(%s)" % (self.__class__.__name__, getattr(self, 'kernel_id', 'uninitialized'))
@@ -303,12 +303,12 @@ def write_stderr(error_message):
 
             # Queue a removal of the byte and message count for a time in the 
             # future, when we are no longer interested in it.
-            self._iopub_window_byte_queue.append((now + self.limit_window, byte_count))
+            self._iopub_window_byte_queue.append((now + self.rate_limit_window, byte_count))
 
             # Check the limits, set the limit flags, and reset the
             # message and data counts.
-            msg_rate = float(self._iopub_window_msg_count) / self.limit_window
-            data_rate = float(self._iopub_window_byte_count) / self.limit_window
+            msg_rate = float(self._iopub_window_msg_count) / self.rate_limit_window
+            data_rate = float(self._iopub_window_byte_count) / self.rate_limit_window
 
             # Check the msg rate
             if self.iopub_msg_rate_limit is not None and msg_rate > self.iopub_msg_rate_limit and self.iopub_msg_rate_limit > 0: