Skip to content

Commit 4633f3e

Browse files
committed
Sanitise _setlatlab function
1 parent cba0ebc commit 4633f3e

File tree

1 file changed

+31
-27
lines changed

1 file changed

+31
-27
lines changed

packages/basemap/src/mpl_toolkits/basemap/__init__.py

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5353,39 +5353,43 @@ def _setlonlab(fmt,lon,labelstyle):
53535353
lonlab = lonlabstr%lon
53545354
return lonlab
53555355

5356-
def _setlatlab(fmt,lat,labelstyle):
5357-
# set lat label string (called by Basemap.drawparallels)
5358-
try: # fmt is a function that returns a formatted string
5359-
latlab = fmt(lat)
5360-
except: # fmt is a format string.
5361-
if lat<0:
5362-
if mpl.rcParams['text.usetex']:
5363-
if labelstyle=='+/-':
5364-
latlabstr = r'${\/-%s\/^{\circ}}$'%fmt
5356+
5357+
def _setlatlab(fmt, lat, labelstyle):
5358+
"""Set latitude label string (called by :meth:`Basemap.drawparallels`)."""
5359+
5360+
try:
5361+
# `fmt` is a function that returns a formatted string.
5362+
latlab = fmt(lat)
5363+
except:
5364+
# `fmt` is a format string.
5365+
if lat < 0:
5366+
if mpl.rcParams["text.usetex"]:
5367+
if labelstyle == "+/-":
5368+
latlabstr = r"${\/-%s\/^{\circ}}$" % fmt
53655369
else:
5366-
latlabstr = r'${%s\/^{\circ}\/S}$'%fmt
5370+
latlabstr = r"${%s\/^{\circ}\/S}$" % fmt
53675371
else:
5368-
if labelstyle=='+/-':
5369-
latlabstr = u'-%s\N{DEGREE SIGN}'%fmt
5372+
if labelstyle == "+/-":
5373+
latlabstr = u"-%s\N{DEGREE SIGN}" % fmt
53705374
else:
5371-
latlabstr = u'%s\N{DEGREE SIGN}S'%fmt
5372-
latlab = latlabstr%np.fabs(lat)
5373-
elif lat>0:
5374-
if mpl.rcParams['text.usetex']:
5375-
if labelstyle=='+/-':
5376-
latlabstr = r'${\/+%s\/^{\circ}}$'%fmt
5375+
latlabstr = u"%s\N{DEGREE SIGN}S" % fmt
5376+
latlab = latlabstr % np.fabs(lat)
5377+
elif lat > 0:
5378+
if mpl.rcParams["text.usetex"]:
5379+
if labelstyle == "+/-":
5380+
latlabstr = r"${\/+%s\/^{\circ}}$" % fmt
53775381
else:
5378-
latlabstr = r'${%s\/^{\circ}\/N}$'%fmt
5382+
latlabstr = r"${%s\/^{\circ}\/N}$" % fmt
53795383
else:
5380-
if labelstyle=='+/-':
5381-
latlabstr = u'+%s\N{DEGREE SIGN}'%fmt
5384+
if labelstyle == "+/-":
5385+
latlabstr = u"+%s\N{DEGREE SIGN}" % fmt
53825386
else:
5383-
latlabstr = u'%s\N{DEGREE SIGN}N'%fmt
5384-
latlab = latlabstr%lat
5387+
latlabstr = u"%s\N{DEGREE SIGN}N" % fmt
5388+
latlab = latlabstr % lat
53855389
else:
5386-
if mpl.rcParams['text.usetex']:
5387-
latlabstr = r'${%s\/^{\circ}}$'%fmt
5390+
if mpl.rcParams["text.usetex"]:
5391+
latlabstr = r"${%s\/^{\circ}}$" % fmt
53885392
else:
5389-
latlabstr = u'%s\N{DEGREE SIGN}'%fmt
5390-
latlab = latlabstr%lat
5393+
latlabstr = u"%s\N{DEGREE SIGN}" % fmt
5394+
latlab = latlabstr % lat
53915395
return latlab

0 commit comments

Comments
 (0)