X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=hooke%2Fcurve.py;h=53670151685a92bbc16a373e5b396854ae0e7fc3;hp=e080645f0e2d87d244b59aaea12e3cca60ddc13d;hb=HEAD;hpb=1fc27f9e070cf9667993e89ff7f43824fe66bd0c diff --git a/hooke/curve.py b/hooke/curve.py index e080645..5367015 100644 --- a/hooke/curve.py +++ b/hooke/curve.py @@ -1,20 +1,19 @@ -# Copyright (C) 2010-2011 W. Trevor King +# Copyright (C) 2010-2012 W. Trevor King # # This file is part of Hooke. # -# Hooke is free software: you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. +# Hooke is free software: you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) any +# later version. # -# Hooke is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General -# Public License for more details. +# Hooke is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +# details. # -# You should have received a copy of the GNU Lesser General Public -# License along with Hooke. If not, see -# . +# You should have received a copy of the GNU Lesser General Public License +# along with Hooke. If not, see . """The `curve` module provides :class:`Curve` and :class:`Data` for storing force curves. @@ -93,7 +92,7 @@ class Data (numpy.ndarray): >>> import yaml >>> s = yaml.dump(d) - >>> print s + >>> print(s) !hooke.curve.DataInfo columns: [distance (m), force (N)] @@ -189,7 +188,7 @@ class Curve (object): [}>] >>> z.command_stack[-1].arguments['curve'] == z True - >>> print yaml.dump(c) # doctest: +REPORT_UDIFF + >>> print(yaml.dump(c)) # doctest: +REPORT_UDIFF &id001 !!python/object:hooke.curve.Curve command_stack: !!python/object/new:hooke.command_stack.CommandStack listitems: @@ -215,7 +214,7 @@ class Curve (object): YAML still works, though. - >>> print yaml.dump(c.command_stack) # doctest: +REPORT_UDIFF + >>> print(yaml.dump(c.command_stack)) # doctest: +REPORT_UDIFF &id001 !!python/object/new:hooke.command_stack.CommandStack listitems: - !!python/object:hooke.engine.CommandMessage