Merge pull request #921 from IndustriaTech/fix/920-version-representation

Fixed #920 Version representation

Author: matthiask

debug_toolbar/panels/versions.py

@@ -54,5 +54,7 @@ def get_app_version(self, app):
         else:
             return
         if isinstance(version, (list, tuple)):
-            version = '.'.join(str(o) for o in version)
+            # We strip dots from the right because we do not want to show
+            # trailing dots if there are empty elements in the list/tuple
+            version = '.'.join(str(o) for o in version).rstrip('.')
         return version

tests/panels/test_versions.py

@@ -0,0 +1,40 @@
+# coding: utf-8
+
+from __future__ import absolute_import, unicode_literals
+from collections import namedtuple
+
+from ..base import BaseTestCase
+
+
+version_info_t = namedtuple('version_info_t', (
+    'major', 'minor', 'micro', 'releaselevel', 'serial',
+))
+
+
+class VersionsPanelTestCase(BaseTestCase):
+
+    def setUp(self):
+        super(VersionsPanelTestCase, self).setUp()
+        self.panel = self.toolbar.get_panel_by_id('VersionsPanel')
+
+    def test_app_version_from_get_version_fn(self):
+
+        class FakeApp:
+            def get_version(self):
+                return version_info_t(1, 2, 3, '', '')
+
+        self.assertEqual(self.panel.get_app_version(FakeApp()), '1.2.3')
+
+    def test_app_version_from_VERSION(self):
+
+        class FakeApp:
+            VERSION = version_info_t(1, 2, 3, '', '')
+
+        self.assertEqual(self.panel.get_app_version(FakeApp()), '1.2.3')
+
+    def test_app_version_from_underscode_version(self):
+
+        class FakeApp:
+            __version__ = version_info_t(1, 2, 3, '', '')
+
+        self.assertEqual(self.panel.get_app_version(FakeApp()), '1.2.3')