/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-11 16:06:53 UTC
  • mto: (4286.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4287.
  • Revision ID: v.ladeuil+lp@free.fr-20090411160653-eq1gfn41q3lzhmss
Cleanup test imports and use features to better track skipped tests.

* bzrlib/tests/workingtree_implementations/__init__.py: 
Fix imports. Delete obsolete comment.

* bzrlib/tests/tree_implementations/test_walkdirs.py:
(TestWalkdirs.get_all_subdirs_expected): Reduce duplication.

* bzrlib/tests/tree_implementations/test_test_trees.py: 
Fix import.

* bzrlib/tests/tree_implementations/test_path_content_summary.py: 
Fix imports.

(TestPathContentSummary.test_unicode_symlink_content_summary,
TestPathContentSummary.test_unicode_symlink_target_summary):Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/test_inv.py: 
Fix imports.
(TestInventoryWithSymlinks): Factor out test that requires
symlinks and use _test_needs_features.
(TestInventory.test_canonical_path,
TestInventory.test_canonical_path_dir,
TestInventory.test_canonical_path_root,
TestInventory.test_canonical_path_invalid_all,
TestInventory.test_canonical_invalid_child): Use assert(expected,
actual)

* bzrlib/tests/tree_implementations/test_get_symlink_target.py: 
Fix imports.
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/__init__.py: 
Fix imports.

(TestCaseWithTree.get_tree_with_subdirs_and_all_supported_content_types,
TestCaseWithTree._create_tree_with_utf8): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/test_workingtree_4.py:
Fix too long lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
27
27
    osutils,
28
28
    trace,
29
29
    )
 
30
from bzrlib.branch import Branch
30
31
 
31
32
 
32
33
def show_version(show_config=True, show_copyright=True, to_file=None):
33
 
    import platform
34
 
 
35
34
    if to_file is None:
36
35
        to_file = sys.stdout
37
36
    to_file.write("Bazaar (bzr) %s\n" % bzrlib.__version__)
49
48
    # show path to python interpreter
50
49
    # (bzr.exe use python interpreter from pythonXY.dll
51
50
    # but sys.executable point to bzr.exe itself)
52
 
    # however, sys.frozen exists if running from bzr.exe
53
 
    # see http://www.py2exe.org/index.cgi/Py2exeEnvironment
54
 
    if getattr(sys, 'frozen', None) is None: # if not bzr.exe
 
51
    if not hasattr(sys, 'frozen'):  # check for bzr.exe
 
52
        # python executable
55
53
        to_file.write(sys.executable + ' ')
56
54
    else:
57
55
        # pythonXY.dll
64
62
 
65
63
    to_file.write("  Python standard library:" + ' ')
66
64
    to_file.write(os.path.dirname(os.__file__) + '\n')
67
 
    to_file.write("  Platform: %s\n" % platform.platform(aliased=1))
68
65
    to_file.write("  bzrlib: ")
69
66
    if len(bzrlib.__path__) > 1:
70
67
        # print repr, which is a good enough way of making it clear it's
82
79
    if show_copyright:
83
80
        to_file.write('\n')
84
81
        to_file.write(bzrlib.__copyright__ + '\n')
85
 
        to_file.write("http://bazaar.canonical.com/\n")
 
82
        to_file.write("http://bazaar-vcs.org/\n")
86
83
        to_file.write('\n')
87
84
        to_file.write("bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and\n")
88
85
        to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
89
86
        to_file.write("General Public License version 2 or later.\n")
90
 
        to_file.write("\nBazaar is part of the GNU Project to produce a free operating "
91
 
                "system.\n")
92
87
    to_file.write('\n')
93
88
 
94
89