Skip to content

Commit

Permalink
Renamed Posix and Windows timeout modules consistently with others.
Browse files Browse the repository at this point in the history
Related to #1931. Assuming tests on CI pass, that issue is now done.
  • Loading branch information
pekkaklarck committed Feb 25, 2015
1 parent cdfb783 commit 2edb53a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/robot/running/timeouts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
IRONPYTHON, JYTHON, WINDOWS)
from robot.errors import TimeoutError, DataError, FrameworkError

if IRONPYTHON:
from .ironpython import Timeout
elif JYTHON:
if JYTHON:
from .jython import Timeout
elif IRONPYTHON:
from .ironpython import Timeout
elif WINDOWS:
from .timeoutwin import Timeout
from .windows import Timeout
else:
from .timeoutsignaling import Timeout
from .posix import Timeout


class _Timeout(object):
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 2edb53a

Please sign in to comment.