merge

diff --cc Cython/Compiler/Main.py
Simple merge

diff --cc Cython/Compiler/Options.py
index 86b1c64ba683902b18f3b48234705ac2343c3f18,99b7648558c8bfacf722f4cc1afabcad17ec5df2..97281fb406f452dbf09e2e17f0e75f19b90a5de1
--- 1/Cython/Compiler/Options.py
--- 2/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):