/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/python-compat.h

  • 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:
bzrlib/python-compat.h
 
1
/*
 
2
 *  Bazaar -- distributed version control
 
3
 *
 
4
 * Copyright (C) 2008 by Canonical Ltd
 
5
 *
 
6
 * This program is free software; you can redistribute it and/or modify
 
7
 * it under the terms of the GNU General Public License as published by
 
8
 * the Free Software Foundation; either version 2 of the License, or
 
9
 * (at your option) any later version.
 
10
 *
 
11
 * This program is distributed in the hope that it will be useful,
 
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
14
 * GNU General Public License for more details.
 
15
 *
 
16
 * You should have received a copy of the GNU General Public License
 
17
 * along with this program; if not, write to the Free Software
 
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
19
 */
 
20
 
 
21
/* Provide the typedefs that pyrex does automatically in newer versions, to
 
22
 * allow older versions  to build our extensions.
 
23
 */
 
24
 
 
25
#ifndef _BZR_PYTHON_COMPAT_H
 
26
#define _BZR_PYTHON_COMPAT_H
 
27
 
 
28
/* http://www.python.org/dev/peps/pep-0353/ */
 
29
#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
 
30
    typedef int Py_ssize_t;
 
31
    #define PY_SSIZE_T_MAX INT_MAX
 
32
    #define PY_SSIZE_T_MIN INT_MIN
 
33
    #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
 
34
    #define PyInt_AsSsize_t(o) PyInt_AsLong(o)
 
35
#endif
 
36
 
 
37
#if defined(_WIN32) || defined(WIN32)
 
38
    /* Defining WIN32_LEAN_AND_MEAN makes including windows quite a bit
 
39
     * lighter weight.
 
40
     */
 
41
    #define WIN32_LEAN_AND_MEAN
 
42
    #include <windows.h>
 
43
 
 
44
    /* Needed for htonl */
 
45
    #include "Winsock2.h"
 
46
 
 
47
    /* sys/stat.h doesn't have any of these macro definitions for MSVC, so
 
48
     * we'll define whatever is missing that we actually use.
 
49
     */
 
50
    #if !defined(S_ISDIR)
 
51
        #define S_ISDIR(m) (((m) & 0170000) == 0040000)
 
52
    #endif
 
53
    #if !defined(S_ISREG)
 
54
        #define S_ISREG(m) (((m) & 0170000) == 0100000)
 
55
    #endif
 
56
    #if !defined(S_IXUSR)
 
57
        #define S_IXUSR 0000100/* execute/search permission, owner */
 
58
    #endif
 
59
    /* sys/stat.h doesn't have S_ISLNK on win32, so we fake it by just always
 
60
     * returning False
 
61
     */
 
62
    #if !defined(S_ISLNK)
 
63
        #define S_ISLNK(mode) (0)
 
64
    #endif
 
65
#else /* Not win32 */
 
66
    /* For htonl */
 
67
    #include "arpa/inet.h"
 
68
#endif
 
69
 
 
70
 
 
71
#endif /* _BZR_PYTHON_COMPAT_H */