Skip to content

Issue244: Fix for isinstance str in python 3. #245

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

Closed
wants to merge 1 commit into from
Closed

Issue244: Fix for isinstance str in python 3. #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pvlib/location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def __init__(self, latitude, longitude, tz='UTC', altitude=0,
self.latitude = latitude
self.longitude = longitude

if isinstance(tz, str):
if isinstance(tz, basestring):
self.tz = tz
self.pytz = pytz.timezone(tz)
elif isinstance(tz, datetime.tzinfo):
Expand Down
2 changes: 1 addition & 1 deletion pvlib/test/test_location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def test_location_all():


@pytest.mark.parametrize('tz', [
aztz, 'America/Phoenix', -7, -7.0,
aztz, 'America/Phoenix', -7, -7.0, u'Etc/GMT+7',
])
def test_location_tz(tz):
Location(32.2, -111, tz)
Expand Down