summaryrefslogtreecommitdiff
path: root/numpy/lib/function_base.py
diff options
context:
space:
mode:
authorJarrod Millman <millman@berkeley.edu>2008-12-31 23:25:03 +0000
committerJarrod Millman <millman@berkeley.edu>2008-12-31 23:25:03 +0000
commit8c448a31743b9ea5bc18e06dfa42c078206ca529 (patch)
treece25aed9f383011568653d7761918eeb11ba7dde /numpy/lib/function_base.py
parent1bb5bb5529d78ba95e76c802544f8b6efa84ec33 (diff)
downloadnumpy-8c448a31743b9ea5bc18e06dfa42c078206ca529.tar.gz
ran reindent
Diffstat (limited to 'numpy/lib/function_base.py')
-rw-r--r--numpy/lib/function_base.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py
index 8bf20d3fb..425960639 100644
--- a/numpy/lib/function_base.py
+++ b/numpy/lib/function_base.py
@@ -228,10 +228,10 @@ def histogram(a, bins=10, range=None, normed=False, weights=None, new=None):
* None : the new behaviour is used, no warning is printed.
* True : the new behaviour is used and a warning is raised about
the future removal of the `new` keyword.
- * False : the old behaviour is used and a DeprecationWarning
+ * False : the old behaviour is used and a DeprecationWarning
is raised.
- As of NumPy 1.3, this keyword should not be used explicitly since it
- will disappear in NumPy 1.4.
+ As of NumPy 1.3, this keyword should not be used explicitly since it
+ will disappear in NumPy 1.4.
Returns
-------
@@ -267,9 +267,9 @@ def histogram(a, bins=10, range=None, normed=False, weights=None, new=None):
# Old behavior
if new == False:
warnings.warn("""
- The histogram semantics being used is now deprecated and
- will disappear in NumPy 1.4. Please update your code to
- use the default semantics.
+ The histogram semantics being used is now deprecated and
+ will disappear in NumPy 1.4. Please update your code to
+ use the default semantics.
""", DeprecationWarning)
a = asarray(a).ravel()
@@ -320,8 +320,8 @@ def histogram(a, bins=10, range=None, normed=False, weights=None, new=None):
elif new in [True, None]:
if new is True:
warnings.warn("""
- The new semantics of histogram is now the default and the `new`
- keyword will be removed in NumPy 1.4.
+ The new semantics of histogram is now the default and the `new`
+ keyword will be removed in NumPy 1.4.
""", Warning)
a = asarray(a)
if weights is not None: