From d0b44c7109507f2de0ce5fa66a282d4799e9ec63 Mon Sep 17 00:00:00 2001 From: klbostee Date: Fri, 10 Apr 2009 15:54:47 +0200 Subject: [PATCH] Closes #13 --- dumbo/core.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dumbo/core.py b/dumbo/core.py index ff227d5..b0ac676 100644 --- a/dumbo/core.py +++ b/dumbo/core.py @@ -472,7 +472,8 @@ def run(mapper, if os.environ.has_key('stream_map_input') and \ os.environ['stream_map_input'].lower() == 'typedbytes': print >> sys.stderr, "INFO: inputting typed bytes" - import typedbytes + try: import ctypedbytes as typedbytes + except ImportError: import typedbytes inputs = typedbytes.PairedInput(sys.stdin).reads() else: inputs = loadcode(line[:-1] for line in sys.stdin) @@ -520,7 +521,8 @@ def run(mapper, if os.environ.has_key('stream_map_output') and \ os.environ['stream_map_output'].lower() == 'typedbytes': print >> sys.stderr, "INFO: outputting typed bytes" - import typedbytes + try: import ctypedbytes as typedbytes + except ImportError: import typedbytes typedbytes.PairedOutput(sys.stdout).writes(outputs) else: for output in dumpcode(outputs): @@ -529,7 +531,8 @@ def run(mapper, if os.environ.has_key('stream_reduce_input') and \ os.environ['stream_reduce_input'].lower() == 'typedbytes': print >> sys.stderr, "INFO: inputting typed bytes" - import typedbytes + try: import ctypedbytes as typedbytes + except ImportError: import typedbytes inputs = typedbytes.PairedInput(sys.stdin).reads() else: inputs = loadcode(line[:-1] for line in sys.stdin) @@ -546,7 +549,8 @@ def run(mapper, if os.environ.has_key('stream_reduce_output') and \ os.environ['stream_reduce_output'].lower() == 'typedbytes': print >> sys.stderr, "INFO: outputting typed bytes" - import typedbytes + try: import ctypedbytes as typedbytes + except ImportError: import typedbytes typedbytes.PairedOutput(sys.stdout).writes(outputs) else: for output in dumpcode(outputs):