From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Mon, 5 Oct 2009 13:11:44 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.13.beta0~2^2~123^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74006e33656fe108ed427e3bdc399774027c5c02;p=cython.git

merge
---

74006e33656fe108ed427e3bdc399774027c5c02
diff --cc Cython/Compiler/Options.py
index 86b1c64b,99b76485..97281fb4
--- a/Cython/Compiler/Options.py
+++ b/Cython/Compiler/Options.py
@@@ -68,7 -68,11 +68,11 @@@ option_defaults = 
      'c99_complex' : False, # Don't use macro wrappers for complex arith, not sure what to name this...
      'callspec' : "",
      'profile': False,
-     'autotestdict': True
 -    'doctesthack': False,
++    'autotestdict': True,
+ 
+ # test support
+     'test_assert_path_exists' : [],
+     'test_fail_if_path_exists' : [],
  }
  
  # Override types possibilities above, if needed
@@@ -80,7 -84,9 +84,9 @@@ for key, val in option_defaults.items()
  
  option_scopes = { # defaults to available everywhere
      # 'module', 'function', 'class', 'with statement'
-     'autotestdict' : ('module',)
 -    'doctesthack' : ('module',),
++    'autotestdict' : ('module',),
+     'test_assert_path_exists' : ('function',),
+     'test_fail_if_path_exists' : ('function',),
  }
  
  def parse_option_value(name, value):