cleanup: update copyright headers and other values

README.md

@@ -2,9 +2,9 @@
 
 [![Build Status](https://github.com/s3tools/s3cmd/actions/workflows/test.yml/badge.svg)](https://github.com/s3tools/s3cmd/actions/workflows/test.yml)
 
-* Author: Michal Ludvig, [email protected]
-* [Project homepage](http://s3tools.org)
-* (c) [TGRMN Software](http://www.tgrmn.com) and contributors
+* Authors: Michal Ludvig ([email protected]), Florent Viard ([email protected])
+* [Project homepage](https://s3tools.org)
+* (c) [TGRMN Software](http://www.tgrmn.com), [Sodria SAS](http://www.sodria.com) and contributors
 
 
 S3tools / S3cmd mailing lists:
@@ -38,7 +38,7 @@ give these keys to S3cmd. Think of them as if they were a username and password
 
 At the time of this writing the costs of using S3 are (in USD):
 
-$0.026 per GB per month of storage space used
+$0.023 per GB per month of storage space used
 
 plus
 
@@ -57,15 +57,15 @@ plus
 $0.005 per 1,000 PUT or COPY or LIST requests
 $0.004 per 10,000 GET and all other requests
 
-If for instance on 1st of January you upload 2GB of photos in JPEG from your holiday in New Zealand, at the end of January you will be charged $0.06 for using 2GB of storage space for a month, $0.0 for uploading 2GB of data, and a few cents for requests. That comes to slightly over $0.06 for a complete backup of your precious holiday pictures.
+If for instance on 1st of January you upload 2GB of photos in JPEG from your holiday in New Zealand, at the end of January you will be charged $0.05 for using 2GB of storage space for a month, $0.0 for uploading 2GB of data, and a few cents for requests. That comes to slightly over $0.06 for a complete backup of your precious holiday pictures.
 
-In February you don't touch it. Your data are still on S3 servers so you pay $0.06 for those two gigabytes, but not a single cent will be charged for any transfer. That comes to $0.06 as an ongoing cost of your backup. Not too bad.
+In February you don't touch it. Your data are still on S3 servers so you pay $0.06 for those two gigabytes, but not a single cent will be charged for any transfer. That comes to $0.05 as an ongoing cost of your backup. Not too bad.
 
-In March you allow anonymous read access to some of your pictures and your friends download, say, 1500MB of them. As the files are owned by you, you are responsible for the costs incurred. That means at the end of March you'll be charged $0.06 for storage plus $0.045 for the download traffic generated by your friends.
+In March you allow anonymous read access to some of your pictures and your friends download, say, 1500MB of them. As the files are owned by you, you are responsible for the costs incurred. That means at the end of March you'll be charged $0.05 for storage plus $0.045 for the download traffic generated by your friends.
 
 There is no minimum monthly contract or a setup fee. What you use is what you pay for. At the beginning my bill used to be like US$0.03 or even nil.
 
-That's the pricing model of Amazon S3 in a nutshell. Check the [Amazon S3 homepage](http://aws.amazon.com/s3/pricing/) for more details.
+That's the pricing model of Amazon S3 in a nutshell. Check the [Amazon S3 homepage](https://aws.amazon.com/s3/pricing/) for more details.
 
 Needless to say that all these money are charged by Amazon itself, there is obviously no payment for using S3cmd :-)
 
@@ -128,7 +128,7 @@ Alternatively the ACL can be altered for existing remote files with `s3cmd setac
 
 1) Register for Amazon AWS / S3
 
-Go to http://aws.amazon.com/s3, click the "Sign up for web service" button in the right column and work through the registration. You will have to supply your Credit Card details in order to allow Amazon charge you for S3 usage. At the end you should have your Access and Secret Keys.
+Go to https://aws.amazon.com/s3, click the "Sign up for web service" button in the right column and work through the registration. You will have to supply your Credit Card details in order to allow Amazon charge you for S3 usage. At the end you should have your Access and Secret Keys.
 
 If you set up a separate IAM user, that user's access key must have at least the following permissions to do anything:
 -  s3:ListAllMyBuckets
@@ -333,11 +333,11 @@ After configuring it with `--configure` all available options are spitted into y
 
 The Transfer commands (put, get, cp, mv, and sync) continue transferring even if an object fails. If a failure occurs the failure is output to stderr and the exit status will be EX_PARTIAL (2). If the option `--stop-on-error` is specified, or the config option stop_on_error is true, the transfers stop and an appropriate error code is returned.
 
-For more information refer to the [S3cmd / S3tools homepage](http://s3tools.org).
+For more information refer to the [S3cmd / S3tools homepage](https://s3tools.org).
 
 ### License
 
-Copyright (C) 2007-2020 TGRMN Software - http://www.tgrmn.com - and contributors
+Copyright (C) 2007-2023 TGRMN Software (https://www.tgrmn.com), Sodria SAS (https://www.sodria.com/) and contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

S3/ACL.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 - Access Control List representation
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, print_function
 

S3/AccessLog.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 - Access Control List representation
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, print_function
 

S3/BaseUtils.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, division
 

S3/BidirMap.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 class BidirMap(object):
     def __init__(self, **map):

S3/CloudFront.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon CloudFront support
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/Config.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/ConnMan.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/Crypto.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/Exceptions.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager - Exceptions library
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/FileDict.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/FileLists.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Create and compare lists of files/objects
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import
 

S3/PkgInfo.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 package = "s3cmd"
 version = "2.3.0-dev"

S3/Progress.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, division
 

S3/S3.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, division
 

S3/S3Uri.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, print_function
 

S3/SortedDict.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, print_function
 

S3/Utils.py

@@ -1,10 +1,14 @@
 # -*- coding: utf-8 -*-
 
+## --------------------------------------------------------------------
 ## Amazon S3 manager
-## Author: Michal Ludvig <[email protected]>
-##         http://www.logix.cz/michal
-## License: GPL Version 2
-## Copyright: TGRMN Software and contributors
+##
+## Authors   : Michal Ludvig <[email protected]> (https://www.logix.cz/michal)
+##             Florent Viard <[email protected]> (https://www.sodria.com)
+## Copyright : TGRMN Software, Sodria SAS and contributors
+## License   : GPL Version 2
+## Website   : https://s3tools.org
+## --------------------------------------------------------------------
 
 from __future__ import absolute_import, division