Merge branch 'other-misc-issues' into master

wolever · Jan 4, 2021 · 32076c4 · 32076c4
2 parents 1164f20 + 9d5c209
commit 32076c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,6 +1,10 @@
 0.7.5 (2021-01-04)
     * Fix crash on Python 2.7 with unicode docstrings
       (https://github.com/wolever/parameterized/issues/109)
+    * Replace inspect.stack() with faster inspect.currentframe()
+      (https://github.com/wolever/parameterized/issues/107)
+    * Add a __version__ string to the package
+      (https://github.com/wolever/parameterized/issues/103)
 
 0.7.4 (2020-04-14)
     * Add ``class_name_func`` option to ``@parameterized_class``

diff --git a/parameterized/__init__.py b/parameterized/__init__.py
@@ -1 +1,3 @@
 from .parameterized import parameterized, param, parameterized_class
+
+__version__ = "0.7.5"
diff --git a/parameterized/parameterized.py b/parameterized/parameterized.py
@@ -495,9 +495,7 @@ def expand(cls, input, name_func=None, doc_func=None, skip_on_empty=False,
         name_func = name_func or default_name_func
 
         def parameterized_expand_wrapper(f, instance=None):
-            stack = inspect.stack()
-            frame = stack[1]
-            frame_locals = frame[0].f_locals
+            frame_locals = inspect.currentframe().f_back.f_locals
 
             parameters = cls.input_as_callable(input)()
 

diff --git a/setup.py b/setup.py
@@ -6,6 +6,8 @@
 
 from setuptools import setup, find_packages
 
+import parameterized
+
 os.chdir(os.path.dirname(sys.argv[0]) or ".")
 
 try:
@@ -15,7 +17,7 @@
 
 setup(
     name="parameterized",
-    version="0.7.4",
+    version=parameterized.__version__,
     url="https://github.com/wolever/parameterized",
     license="FreeBSD",
     author="David Wolever",
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		from .parameterized import parameterized, param, parameterized_class

		__version__ = "0.7.5"