Show More
@@ -152,9 +152,6 b" skip_if_not_win32 = skipif(sys.platform != 'win32'," | |||||
152 | "This test only runs under Windows") |
|
152 | "This test only runs under Windows") | |
153 | skip_if_not_linux = skipif(not sys.platform.startswith('linux'), |
|
153 | skip_if_not_linux = skipif(not sys.platform.startswith('linux'), | |
154 | "This test only runs under Linux") |
|
154 | "This test only runs under Linux") | |
155 | skip_if_not_osx = skipif(sys.platform != 'darwin', |
|
|||
156 | "This test only runs under OSX") |
|
|||
157 |
|
||||
158 |
|
155 | |||
159 | _x11_skip_cond = (sys.platform not in ('darwin', 'win32') and |
|
156 | _x11_skip_cond = (sys.platform not in ('darwin', 'win32') and | |
160 | os.environ.get('DISPLAY', '') == '') |
|
157 | os.environ.get('DISPLAY', '') == '') | |
@@ -171,8 +168,6 b" skipif_not_numpy = skip_without('numpy')" | |||||
171 |
|
168 | |||
172 | skipif_not_matplotlib = skip_without('matplotlib') |
|
169 | skipif_not_matplotlib = skip_without('matplotlib') | |
173 |
|
170 | |||
174 | skipif_not_sympy = skip_without('sympy') |
|
|||
175 |
|
||||
176 | # A null 'decorator', useful to make more readable code that needs to pick |
|
171 | # A null 'decorator', useful to make more readable code that needs to pick | |
177 | # between different decorators based on OS or other conditions |
|
172 | # between different decorators based on OS or other conditions | |
178 | null_deco = lambda f: f |
|
173 | null_deco = lambda f: f |
@@ -61,8 +61,6 b' if resource is not None and hasattr(resource, "getrusage"):' | |||||
61 |
|
61 | |||
62 | Similar to clock(), but return a tuple of user/system times.""" |
|
62 | Similar to clock(), but return a tuple of user/system times.""" | |
63 | return resource.getrusage(resource.RUSAGE_SELF)[:2] |
|
63 | return resource.getrusage(resource.RUSAGE_SELF)[:2] | |
64 |
|
||||
65 |
|
||||
66 | else: |
|
64 | else: | |
67 | # There is no distinction of user/system time under windows, so we just use |
|
65 | # There is no distinction of user/system time under windows, so we just use | |
68 | # time.perff_counter() for everything... |
|
66 | # time.perff_counter() for everything... |
General Comments 0
You need to be logged in to leave comments.
Login now