Skip to content

Wrappers as decorators #42

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.

Sign up for GitHub

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

Merged
lukelbd merged 16 commits into from
Sep 15, 2019
Merged

Wrappers as decorators #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b13a7b7
Implement disabled methods, text wrapper with decorators
lukelbd Sep 14, 2019
4be37c4
Merge from master, repair conflicts
lukelbd Sep 15, 2019
fe83c60
Remove disabled methods param
lukelbd Sep 15, 2019
094dce6
Rename wrappers, list methods that use wrappers automatically instead…
lukelbd Sep 15, 2019
12a6c76
Remove _unexpected_usage decorator (overkill)
lukelbd Sep 15, 2019
becc010
Fix colorbar_wrapper legend_wrapper refs
lukelbd Sep 15, 2019
d682a1d
Rename autoformat_[12]d --> standardize_[12]d, improve documentation,…
lukelbd Sep 15, 2019
55293e5
Implement all wrappers with decorators, not __getattribute__, and add…
lukelbd Sep 15, 2019
5f8284f
Stop disabling loglog, semilog, plot_date, and fix _redirect wrapper
lukelbd Sep 15, 2019
1d101ed
Basemap norecurse bugfix, _wrapper_decorator bugfix
lukelbd Sep 15, 2019
5f6f808
Fix standardize_2d basemap bug due to lon-->x name conflict
lukelbd Sep 15, 2019
0a0a97d
Rename wrapper --> _wrapper, easier to visually ignore in traceback
lukelbd Sep 15, 2019
168b627
Fix bug where cmap_wrapper doesn't send levels to LinearSegmentedNorm
lukelbd Sep 15, 2019
72751b4
Remove old panels ref, fix 'legend-colorbar' implementation
lukelbd Sep 15, 2019
18984b2
Verify tutorials not broken, fix misc bugs
lukelbd Sep 15, 2019
6a4b397
Fix enforce_edges bug, namespace pollution
lukelbd Sep 15, 2019
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
Prev Previous commit
Next Next commit
Stop disabling loglog, semilog, plot_date, and fix _redirect wrapper
  • Loading branch information
@lukelbd
lukelbd committed Sep 15, 2019
commit 5f8284f1ffbdacfa2134c84f8adfc3915de52f72
8 changes: 0 additions & 8 deletions proplot/axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,14 +1380,6 @@ def _iter_panels(self, sides='lrbt'):
axs.append(ax)
return axs

# Disabled methods
_disable = _disable_decorator('Redundant plotting method {!r} has been disabled. Instead, use ax.plot() and set logarithmic axis scales with ax.format(xscale="log", yscale="log").')
loglog = _disable(maxes.Axes.loglog)
semilogx = _disable(maxes.Axes.semilogx)
semilogy = _disable(maxes.Axes.semilogy)
_disable = _disable_decorator('Redundant plotting method {!r} has been disabled. Instead, pass np.datetime64 or datetime.datetime data to ax.plot(), and datetime axes will be enabled automatically.')
plot_date = _disable(maxes.Axes.plot_date)

# Wrapped by special functions
# Also support redirecting to Basemap methods
text = _text_wrapper(
Expand Down
4 changes: 3 additions & 1 deletion proplot/wrappers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,9 @@ def wrapper(self, *args, **kwargs):
return getattr(self.projection, name)(*args, ax=self, **kwargs)
else:
return func(self, *args, **kwargs)
return functools.wraps(func)(wrapper)
wrapper = functools.wraps(func)(wrapper)
wrapper.__doc__ = None
return wrapper

# Basemap recursion fix decorator
def _no_recurse(func):
Expand Down