Merge branch 'develop' into release-0.12.1rc1

PicoCentauri · Oct 10, 2015 · fb1e050 · fb1e050
2 parents bd49cc9 + fdcbe82
commit fb1e050
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/package/CHANGELOG b/package/CHANGELOG
@@ -31,6 +31,7 @@ Fixes
     keyword argument Universe(..., dt=<dt>)
   * Fixed a bug in topology.core.guess_atom_element where a
     single digit atom name would raise an IndexError (#476)
+  * Fixed numpy -> np in LeafletFinder
 
 10/04/15 kain88-de, richardjgowers, dotsdl, sseyler, orbeckst, jbarnoud
 

diff --git a/package/MDAnalysis/analysis/leaflet.py b/package/MDAnalysis/analysis/leaflet.py
@@ -160,7 +160,7 @@ def _get_graph(self):
 
     def _get_components(self):
         """Return connected components (as sorted numpy arrays), sorted by size."""
-        return [numpy.sort(component) for component in NX.connected_components(self.graph)]
+        return [np.sort(component) for component in NX.connected_components(self.graph)]
 
     def update(self, cutoff=None):
         """Update components, possibly with a different *cutoff*"""