From 395375e2f36cee74f78fe203f38d2722e931d771 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 11 May 2012 14:11:44 -0400 Subject: [PATCH] Ran update-copyright.py. --- pyafm/__init__.py | 21 ++++++++++----------- pyafm/afm.py | 21 ++++++++++----------- pyafm/config.py | 21 ++++++++++----------- pyafm/digital_port.py | 16 +++++++++++++++- pyafm/stepper.py | 16 +++++++++++++++- pyafm/storage.py | 16 +++++++++++++++- pyafm/temperature.py | 24 +++++++++++------------- 7 files changed, 86 insertions(+), 49 deletions(-) diff --git a/pyafm/__init__.py b/pyafm/__init__.py index c6e5737..27ab89a 100644 --- a/pyafm/__init__.py +++ b/pyafm/__init__.py @@ -1,19 +1,18 @@ -# Copyright (C) 2009-2011 W. Trevor King +# Copyright (C) 2011-2012 W. Trevor King # # This file is part of pyafm. # -# pyafm is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. # -# pyafm 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 -# General Public License for more details. +# pyafm 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 General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with pyafm. If not, see . +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . from .config import PackageConfig as _PackageConfig diff --git a/pyafm/afm.py b/pyafm/afm.py index 61a036f..b7adcfb 100644 --- a/pyafm/afm.py +++ b/pyafm/afm.py @@ -1,19 +1,18 @@ -# Copyright (C) 2009-2011 W. Trevor King +# Copyright (C) 2011-2012 W. Trevor King # # This file is part of pyafm. # -# pyafm is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. # -# pyafm 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 -# General Public License for more details. +# pyafm 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 General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with pyafm. If not, see . +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . """Tools for controlling atomic force microscopes. diff --git a/pyafm/config.py b/pyafm/config.py index dca08a0..6b3fa0e 100644 --- a/pyafm/config.py +++ b/pyafm/config.py @@ -1,19 +1,18 @@ -# Copyright (C) 2011 W. Trevor King +# Copyright (C) 2011-2012 W. Trevor King # # This file is part of pyafm. # -# pyafm is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. # -# pyafm 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 -# General Public License for more details. +# pyafm 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 General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with pyafm. If not, see . +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . "AFM configuration" diff --git a/pyafm/digital_port.py b/pyafm/digital_port.py index 508b4e8..49d6831 100644 --- a/pyafm/digital_port.py +++ b/pyafm/digital_port.py @@ -1,4 +1,18 @@ -# Copyright +# Copyright (C) 2012 W. Trevor King +# +# This file is part of pyafm. +# +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. +# +# pyafm 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . from pycomedi.channel import DigitalChannel as _DigitalChannel import pypiezo.base as _base diff --git a/pyafm/stepper.py b/pyafm/stepper.py index 6683484..f8293ad 100644 --- a/pyafm/stepper.py +++ b/pyafm/stepper.py @@ -1,4 +1,18 @@ -# Copyright +# Copyright (C) 2012 W. Trevor King +# +# This file is part of pyafm. +# +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. +# +# pyafm 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . from __future__ import absolute_import diff --git a/pyafm/storage.py b/pyafm/storage.py index 35845ff..9b1e0f8 100644 --- a/pyafm/storage.py +++ b/pyafm/storage.py @@ -1,4 +1,18 @@ -# Copyright +# Copyright (C) 2012 W. Trevor King +# +# This file is part of pyafm. +# +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. +# +# pyafm 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . import os.path as _os_path diff --git a/pyafm/temperature.py b/pyafm/temperature.py index a50b448..27d9bde 100644 --- a/pyafm/temperature.py +++ b/pyafm/temperature.py @@ -1,20 +1,18 @@ -# Copyright (C) 2011 W. Trevor King +# Copyright (C) 2012 W. Trevor King # -# This file is part of unfold_protein. +# This file is part of pyafm. # -# Unfold_protein 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. +# pyafm is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. # -# Unfold_protein 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. +# pyafm 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 General Public License for more details. # -# You should have received a copy of the GNU Lesser General Public -# License along with unfold_protein. If not, see -# . +# You should have received a copy of the GNU General Public License along with +# pyafm. If not, see . from scipy.constants import C2K as _C2K from pypid.backend.melcor import MelcorBackend as _TemperatureBackend -- 2.26.2