Rename storage to store to avoid conflicting with Django terminology.

Author: aaugustin

debug_toolbar/static/debug_toolbar/js/toolbar.js

@@ -27,12 +27,12 @@
                 } else {
                     $('.panelContent').hide(); // Hide any that are already open
                     var inner = current.find('.djDebugPanelContent .scroll'),
-                        storage_id = $('#djDebug').data('storage-id'),
+                        store_id = $('#djDebug').data('store-id'),
                         render_panel_url = $('#djDebug').data('render-panel-url');
-                    if (storage_id !== '' && inner.children().length === 0) {
+                    if (store_id !== '' && inner.children().length === 0) {
                         var ajax_data = {
                             data: {
-                                storage_id: storage_id,
+                                store_id: store_id,
                                 panel_id: this.className
                             },
                             type: 'GET',

debug_toolbar/templates/debug_toolbar/base.html

@@ -9,7 +9,7 @@
 <script src="{{ STATIC_URL }}debug_toolbar/js/jquery.cookie.js"></script>
 <script src="{{ STATIC_URL }}debug_toolbar/js/toolbar.js"></script>
 <div id="djDebug" style="display:none;" dir="ltr"
-     data-storage-id="{{ toolbar.storage_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}"
+     data-store-id="{{ toolbar.store_id }}" data-render-panel-url="{% url 'djdt:render_panel' %}"
      {{ toolbar.config.ROOT_TAG_ATTRS|safe }}>
 	<div style="display:none;" id="djDebugToolbar">
 		<ul id="djDebugPanelList">
@@ -53,7 +53,7 @@ <h3>{{ panel.title|safe }}</h3>
 				</div>
 				<div class="djDebugPanelContent">
 					<div class="scroll">
-						{% if not toolbar.storage_id %}{{ panel.content }}{% endif %}
+						{% if not toolbar.store_id %}{{ panel.content }}{% endif %}
 					</div>
 				</div>
 			</div>

debug_toolbar/toolbar.py

@@ -30,7 +30,7 @@ def __init__(self, request):
             panel_instance = panel_class(self, context=self.template_context)
             self._panels[panel_instance.panel_id] = panel_instance
         self.stats = {}
-        self.storage_id = None
+        self.store_id = None
 
     # Manage panels
 
@@ -67,7 +67,7 @@ def render_toolbar(self):
 
     # Handle storing toolbars in memory and fetching them later on
 
-    _storage = SortedDict()
+    _store = SortedDict()
 
     def should_render_panels(self):
         render_panels = self.config['RENDER_PANELS']
@@ -76,17 +76,17 @@ def should_render_panels(self):
         return render_panels
 
     def store(self):
-        self.storage_id = uuid.uuid4().hex
+        self.store_id = uuid.uuid4().hex
         cls = type(self)
-        cls._storage[self.storage_id] = self
-        for _ in range(len(cls._storage) - self.config['RESULTS_CACHE_SIZE']):
+        cls._store[self.store_id] = self
+        for _ in range(len(cls._store) - self.config['RESULTS_CACHE_SIZE']):
             # When we drop support for Python 2.6 and switch to
             # collections.OrderedDict, use popitem(last=False).
-            del cls._storage[cls._storage.keyOrder[0]]
+            del cls._store[cls._store.keyOrder[0]]
 
     @classmethod
-    def fetch(cls, storage_id):
-        return cls._storage.get(storage_id)
+    def fetch(cls, store_id):
+        return cls._store.get(store_id)
 
     # Manually implement class-level caching of panel classes and url patterns
     # because it's more obvious than going through an abstraction.

debug_toolbar/views.py

@@ -9,7 +9,7 @@
 
 def render_panel(request):
     """Render the contents of a panel"""
-    toolbar = DebugToolbar.fetch(request.GET['storage_id'])
+    toolbar = DebugToolbar.fetch(request.GET['store_id'])
     if toolbar is None:
         content = _("Data for this panel isn't available anymore. "
                     "Please reload the page and retry.")

tests/test_integration.py

@@ -136,7 +136,7 @@ def test_basic(self):
         self.assertIn("Version", table.text)
 
     @override_settings(DEBUG_TOOLBAR_CONFIG={'RESULTS_CACHE_SIZE': 0})
-    def test_expired_storage(self):
+    def test_expired_store(self):
         self.selenium.get(self.live_server_url + '/regular/basic/')
         version_panel = self.selenium.find_element_by_id('VersionsPanel')