From: Stefan Behnel <scoder@users.berlios.de>
Date: Sat, 16 Apr 2011 06:28:46 +0000 (+0200)
Subject: merge
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=664dc7c87d85bf4d541427595f433fa146c3cf99;p=cython.git

merge
---

664dc7c87d85bf4d541427595f433fa146c3cf99
diff --cc Cython/Compiler/CmdLine.py
index b2b449dc,327d38b7..c13b6d5b
--- a/Cython/Compiler/CmdLine.py
+++ b/Cython/Compiler/CmdLine.py
@@@ -131,16 -132,14 +132,18 @@@ def parse_command_line(args)
                  options.language_level = 3
              elif option == "--fast-fail":
                  Options.fast_fail = True
+             elif option in ('-Werror', '--warning-errors'):
+                 Options.warning_errors = True
              elif option == "--disable-function-redefinition":
                  Options.disable_function_redefinition = True
 -            elif option in ("-X", "--directive"):
 +            elif option == "--directive" or option.startswith('-X'):
 +                if option.startswith('-X') and option[2:].strip():
 +                    x_args = option[2:]
 +                else:
 +                    x_args = pop_arg()
                  try:
                      options.compiler_directives = Options.parse_directive_list(
 -                        pop_arg(), relaxed_bool=True,
 +                        x_args, relaxed_bool=True,
                          current_settings=options.compiler_directives)
                  except ValueError, e:
                      sys.stderr.write("Error in compiler directive: %s\n" % e.args[0])