get bs_version from css_framework if set

lixxu · Oct 29, 2021 · 2a24419 · 2a24419
1 parent 3892d69
commit 2a24419
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "2021.10.25"
+version = "2021.10.29"
 # The full version, including alpha/beta/rc tags.
-release = "2021.10.25"
+release = "2021.10.29"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -5,7 +5,7 @@ flask-paginate |release| documentation
 
 Overview
 ---------
-Latest version: **2021.10.26**
+Latest version: **2021.10.29**
 
 **flask-paginate** is a simple paginate extension for
 `flask`_ which is reference to `will_paginate`_,
@@ -266,7 +266,12 @@ Contributors
 
 Changelog
 ---------
-Version 2021.10.25
+Version 2021.10.29
+-------------
+
+- `bs_version` is from `css_framework` if `css_framework` was set
+
+Version 2021.10.26
 -------------
 
 - Add `bootstrap5` support

diff --git a/flask_paginate/__init__.py b/flask_paginate/__init__.py
@@ -17,7 +17,7 @@
 
 from flask import Markup, current_app, request, url_for
 
-__version__ = "2021.10.26"
+__version__ = "2021.10.29"
 
 PY2 = sys.version_info[0] == 2
 
@@ -372,18 +372,24 @@ def __init__(self, found=0, **kwargs):
         if self.css_framework not in CURRENT_PAGES:
             self.css_framework = "bootstrap4"
 
-        self.bs_version = kwargs.get("bs_version") or 4
         if self.css_framework.startswith("bootstrap"):
-            if self.bs_version in (2, "2"):
-                self.css_framework = "bootstrap"
-            elif self.bs_version in (3, "3"):
-                self.css_framework = "bootstrap3"
-            elif self.bs_version in ("3.3", "3_3"):
-                self.css_framework = "bootstrap3_3"
-            elif self.bs_version in (4, "4"):
-                self.css_framework = "bootstrap4"
-            elif self.bs_version in (5, "5"):
-                self.css_framework = "bootstrap5"
+            bs_version = self.css_framework[9:]
+            if bs_version in ("3_3", "3.3"):
+                self.bs_version = "3.3"
+            elif bs_version:
+                self.bs_version = bs_version
+            else:
+                self.bs_version = kwargs.get("bs_version", 4)
+                if self.bs_version in (2, "2"):
+                    self.css_framework = "bootstrap"
+                elif self.bs_version in (3, "3"):
+                    self.css_framework = "bootstrap3"
+                elif self.bs_version in ("3.3", "3_3"):
+                    self.css_framework = "bootstrap3_3"
+                elif self.bs_version in (4, "4"):
+                    self.css_framework = "bootstrap4"
+                elif self.bs_version in (5, "5"):
+                    self.css_framework = "bootstrap5"
 
         self.link_size = kwargs.get("link_size", "")
         if self.link_size: