# HG changeset patch
# User David Warde-Farley <wardefar@iro.umontreal.ca>
# Date 1285946902 14400
# Node ID 71f3f22497fefb26e61376f3b2d40b3ecd9c2da0
# Parent  879a5633bb52379a9944f74fd855b992dfdbd98a# Parent  abc7a7e22ead7d241106c5e9696f8d60eb92f0d0
Merging with head.

diff -r abc7a7e22ead -r 71f3f22497fe doc/v2_planning/coding_style.txt
--- a/doc/v2_planning/coding_style.txt	Thu Sep 30 10:18:47 2010 -0400
+++ b/doc/v2_planning/coding_style.txt	Fri Oct 01 11:28:22 2010 -0400
@@ -114,6 +114,10 @@
             from foo import Bar, Blah
          when imported stuff is re-used multiple times in the same file, and
          there is no ambiguity.
+     DWF: One exception I'd like to propose to the "import A as B" moratorium
+          is that we adopt the "import numpy as np" standard that's used in
+          NumPy and SciPy itself. For NumPy heavy code this really cuts down
+	  on clutter, without significant impact on readability (IMHO).
 
    * Imports should usually be on separate lines.
      OD: I would add an exception, saying it is ok to group multiple imports