Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion pandas/core/ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ def _validate(self, lvalues, rvalues, name):

# if tz's must be equal (same or None)
if getattr(lvalues, 'tz', None) != getattr(rvalues, 'tz', None):
raise ValueError("Incompatbile tz's on datetime subtraction "
raise ValueError("Incompatible tz's on datetime subtraction "
"ops")

elif ((self.is_timedelta_lhs or self.is_offset_lhs) and
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/tests/test_pytables.py
Original file line number Diff line number Diff line change
Expand Up @@ -1947,7 +1947,7 @@ def test_append_raise(self):
self.assertRaises(TypeError, store.append,
'df', Series(np.arange(10)))

# appending an incompatbile table
# appending an incompatible table
df = tm.makeDataFrame()
store.append('df', df)

Expand Down