Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use getframe instead of stack #15

Merged
merged 3 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions depocs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"""

import inspect
import sys
import threading


Expand Down Expand Up @@ -196,7 +197,7 @@ class will have its own stack and will be scoped independent of any

_Scoped__is_open = False
_Scoped__is_used = False
_Scoped__open_site = None
_Scoped__open_site_frame = None

def open(self, call_site_level=1):
"""
Expand Down Expand Up @@ -238,9 +239,13 @@ def open(self, call_site_level=1):
self._Scoped__is_open = True
self._Scoped__is_used = True

stack = inspect.stack()
if len(stack) > call_site_level:
self._Scoped__open_site = stack[call_site_level]
try:
frame = sys._getframe(call_site_level)
except ValueError:
# No frame found, skip
pass
else:
self._Scoped__open_site_frame = frame
RouganStriker marked this conversation as resolved.
Show resolved Hide resolved

return self

Expand Down Expand Up @@ -286,8 +291,8 @@ def is_open(self):
return self._Scoped__is_open

@property
def open_site(self):
return self._Scoped__open_site
def open_site(self) -> inspect.Traceback:
return inspect.getframeinfo(self._Scoped__open_site_frame)

@property
def is_used(self):
Expand Down Expand Up @@ -350,7 +355,7 @@ def clear(cls):
def format_trace_entry(self):
if self.open_site:
return "{0}({1}) opened at {2}:{3}\n".format(
self.__class__.__name__, id(self), self.open_site[1], self.open_site[2]
self.__class__.__name__, id(self), self.open_site[0], self.open_site[1]
)
else:
return "{0}({1}) opened somewhere\n".format(
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "depocs"
version = "2.0.0"
version = "2.0.0.dev1"
RouganStriker marked this conversation as resolved.
Show resolved Hide resolved
homepage = "https://github.com/sdelements/depocs"
description = "Scoped thread-local mixin class"
authors = ["Security Compass <[email protected]>"]
Expand Down