Permalink
Browse files

Windows/Py3k fixes c/o Baptiste Lepilleur

closes gh-75
  • Loading branch information...
1 parent cf38679 commit 11f2059ab1f29cc1a2afafed76e84fbe68582536 @blep blep committed with minrk Feb 18, 2011
Showing with 8 additions and 4 deletions.
  1. +1 −0 README.rst
  2. +4 −1 setupegg.py
  3. +2 −2 zmq/eventloop/ioloop.py
  4. +1 −1 zmq/tests/test_stopwatch.py
View
@@ -154,3 +154,4 @@ The following people have contributed to the project:
* Scott Sadler (github AT mashi DOT org)
* spez (steve AT hipmunk DOT com)
* Thomas Kluyver (takowl AT gmail DOT com)
+* Baptiste Lepilleur (baptiste DOT lepilleur AT gmail DOT com)
View
@@ -5,4 +5,7 @@
# now, import setuptools and call the actual setup
import setuptools
-execfile('setup.py')
+try:
+ execfile('setup.py')
+except NameError:
+ exec( open('setup.py','rb').read() )
View
@@ -35,8 +35,8 @@
import fcntl
except ImportError:
if os.name == 'nt':
- import win32_support
- import win32_support as fcntl
+ from zmq.eventloop import win32_support
+ fcntl = win32_support
else:
raise
@@ -50,7 +50,7 @@ def test_stop_microseconds(self):
watch.sleep(1)
us = watch.stop()
toc = time.time()
- self.assertAlmostEqual(us/1e6,(toc-tic),2)
+ self.assertAlmostEqual(us/1e6,(toc-tic),0)
def test_double_stop(self):
"""Test error raised on multiple calls to stop."""

0 comments on commit 11f2059

Please sign in to comment.