Pull request batch2: Batch of my different pull requests

[fviard]

Following pull requests are grouped in this PR:
#342
#357
#416

This PR is based on "Pull Request batch1" so also include:
#369
#348
#355 ( Bugfix import error)
#385

[mdomsch]

Both of these batches are merged now, thank you!

On Mon, Dec 1, 2014 at 9:21 AM, Florent Viard notifications@github.com
wrote:

Following pull requests are grouped in this PR:
#342 #342
#357 #357
#416 #416

This PR is based on "Pull Request batch1" so also include:
#369 #369
#348 #348
#355 #355 ( Bugfix import error)

#385 #385

You can merge this Pull Request by running

git pull https://github.com/fviard/s3cmd pull_request_batch2

Or view, comment on, or merge it at:

#430
Commit Summary

• Changed prices
• Minor changes in README to fix points 1 and 2 in my comment at
  Changed prices #369.
• Specify content-type for request with XML body
• Fixed bug where the error report will not show if there was an
  import error due to dependency on unicodise which was not successfully
  imported
• Changed the exit code for import errors to not rely on dependency of
  EX_GENERAL being defined when not imported
• Specify default checks performed on files being synced
• Cosmetic: removed one empty space in excess of end of run summary.
• Fix MD5 comparison with s3 compatible servers that are not Amazon S3.
• Small cleanup of code, using "in" instead of "find" for strings when
  possible.
• Fix an error in my previous commit:
  b5b61ab. (.find() forgotten to be removed)
• Improve the exit code of s3cmd in the case of an error from S3 to
  give a clearer status of the reason of the failure. Some existing exit
  codes were modified when they were not already in use.
• Disable dns support for buckets when "host_bucket" hostname doesn't
  have a %(bucket)s item in it.

File Changes

• M README https://github.com/s3tools/s3cmd/pull/430/files#diff-0
  (31)
• M S3/ACL.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-1 (4)
• M S3/Exceptions.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-2 (21)
• M S3/ExitCodes.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-3 (34)
• M S3/FileLists.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-4 (6)
• M S3/MultiPart.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-5 (2)
• M S3/S3.py https://github.com/s3tools/s3cmd/pull/430/files#diff-6
  (22)
• M S3/S3Uri.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-7 (2)
• M S3/Utils.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-8 (14)
• M run-tests.py
  https://github.com/s3tools/s3cmd/pull/430/files#diff-9 (4)
• M s3cmd https://github.com/s3tools/s3cmd/pull/430/files#diff-10
  (33)
• M s3cmd.1 https://github.com/s3tools/s3cmd/pull/430/files#diff-11
  (3)

Patch Links:

• https://github.com/s3tools/s3cmd/pull/430.patch
• https://github.com/s3tools/s3cmd/pull/430.diff

—
Reply to this email directly or view it on GitHub
#430.