git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@111 830e0280-6d2a-0410-9c65-932aecc39d9d
Michal Ludvig authored on 2007/04/08 23:59:43... | ... |
@@ -15,10 +15,11 @@ from logging import debug, info, warning, error |
15 | 15 |
import elementtree.ElementTree as ET |
16 | 16 |
|
17 | 17 |
## Our modules |
18 |
+from S3 import PkgInfo |
|
18 | 19 |
from S3.S3 import * |
19 | 20 |
from S3.Config import Config |
20 | 21 |
from S3.S3Uri import * |
21 |
-import S3.PkgInfo |
|
22 |
+ |
|
22 | 23 |
|
23 | 24 |
def output(message): |
24 | 25 |
print message |
... | ... |
@@ -285,10 +286,9 @@ if __name__ == '__main__': |
285 | 285 |
optparser.add_option("-M", "--guess-mime-type", dest="guess_mime_type", action="store_true", help="Guess MIME-type of files by their extension. Falls back to default MIME-Type as specified by --mime-type option") |
286 | 286 |
|
287 | 287 |
optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form.") |
288 |
- optparser.add_option("-u", "--show-uri", dest="show_uri", action="store_true", help="Show complete S3 URI in listings.") |
|
289 | 288 |
optparser.add_option("-v", "--verbose", dest="verbosity", action="store_const", const=logging.INFO, help="Enable verbose output.") |
290 | 289 |
optparser.add_option("-d", "--debug", dest="verbosity", action="store_const", const=logging.DEBUG, help="Enable debug output.") |
291 |
- optparser.add_option( "--version", dest="show_version", action="store_true", help="Show s3cmd version (%s) and exit." % (S3.PkgInfo.version)) |
|
290 |
+ optparser.add_option( "--version", dest="show_version", action="store_true", help="Show s3cmd version (%s) and exit." % (PkgInfo.version)) |
|
292 | 291 |
|
293 | 292 |
optparser.set_usage(optparser.usage + " COMMAND [parameters]") |
294 | 293 |
optparser.set_description('S3cmd is a tool for managing objects in '+ |
... | ... |
@@ -296,7 +296,7 @@ if __name__ == '__main__': |
296 | 296 |
'"buckets" and uploading, downloading and removing '+ |
297 | 297 |
'"objects" from these buckets.') |
298 | 298 |
optparser.epilog = format_commands(optparser.get_prog_name()) |
299 |
- optparser.epilog += ("\nSee program homepage for more information at\n%s\n" % S3.PkgInfo.url) |
|
299 |
+ optparser.epilog += ("\nSee program homepage for more information at\n%s\n" % PkgInfo.url) |
|
300 | 300 |
|
301 | 301 |
(options, args) = optparser.parse_args() |
302 | 302 |
|
... | ... |
@@ -305,7 +305,7 @@ if __name__ == '__main__': |
305 | 305 |
logging.basicConfig(level=options.verbosity, format='%(levelname)s: %(message)s') |
306 | 306 |
|
307 | 307 |
if options.show_version: |
308 |
- output("s3cmd version %s" % S3.PkgInfo.version) |
|
308 |
+ output("s3cmd version %s" % PkgInfo.version) |
|
309 | 309 |
sys.exit(0) |
310 | 310 |
|
311 | 311 |
## Now finally parse the config file |