subvertpy

Merge lp://staging/~luoyonggang/subvertpy/python3 into lp://staging/~jelmer/subvertpy/python3

  1. python3
  2. Merge into python3
Proposed by Yonggang Luo
Status: Superseded
Proposed branch: lp://staging/~luoyonggang/subvertpy/python3
Merge into: lp://staging/~jelmer/subvertpy/python3
Diff against target: 1057 lines (+275/-140)
12 files modified
README (+14/-3)
setup.py (+12/-4)
subvertpy/__init__.py (+1/-1)
subvertpy/_ra.c (+57/-56)
subvertpy/_ra_iter_log.c (+1/-1)
subvertpy/client.c (+11/-18)
subvertpy/editor.c (+1/-1)
subvertpy/py_fixup.h (+118/-0)
subvertpy/repos.c (+22/-21)
subvertpy/util.c (+11/-12)
subvertpy/util.h (+1/-0)
subvertpy/wc.c (+26/-23)
To merge this branch: bzr merge lp://staging/~luoyonggang/subvertpy/python3
Reviewer Review Type Date Requested Status
Jelmer Vernooij Pending
Review via email: mp+93128@code.staging.launchpad.net

This proposal supersedes a proposal from 2012-02-15.

Description of the change

Subvertpy Now can compiled with Python3, both under win and linux.
Python 3.1.2 (release31-maint, Dec 9 2011, 20:59:40)
[GCC 4.4.5] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> from subvertpy import client
>>> import subvertpy
>>> print(subvertpy.wc.version())
(1, 6, 12, '')
>>>

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote : Posted in a previous version of this proposal

Hi,

Thanks for working on this.

Some comments:

* don't use C++ style comments, they break on some compilers
* can you split the svn 1.7 fixes into a separate branch?
* please merge py_fixup.h into util.c/util.h. At the moment this branch doens't build for me because I get duplicate symbols
* subvertpy is compatible back to python 2.4 - please use "from subvertpy import client" rather than "from . import client"

build/temp.linux-x86_64-3.2/subvertpy/wc.o: In function `Text_Size':
/home/jelmer/src/subvertpy/python3/subvertpy/py_fixup.h:117: multiple definition of `Text_Size'
build/temp.linux-x86_64-3.2/subvertpy/client.o:/home/jelmer/src/subvertpy/python3/subvertpy/py_fixup.h:117: first defined here

review: Needs Fixing
Revision history for this message
Yonggang Luo (luoyonggang) wrote : Posted in a previous version of this proposal

> Hi,
>
> Thanks for working on this.
>
> Some comments:
>
> * don't use C++ style comments, they break on some compilers
Make sense
> * can you split the svn 1.7 fixes into a separate branch?
Will do it.
> * please merge py_fixup.h into util.c/util.h. At the moment this branch
The main reason to split py_fixup.h out is that py_fixup.h is relatively independent to SVN, so that it can be used by other projects that want to develop C extensions for both Python 2 and Python 3.
> doens't build for me because I get duplicate symbols
 Text_Size is a problem, should be rename to PyText_Size.
> * subvertpy is compatible back to python 2.4 - please use "from subvertpy
> import client" rather than "from . import client"
OK.
>
>
> build/temp.linux-x86_64-3.2/subvertpy/wc.o: In function `Text_Size':
> /home/jelmer/src/subvertpy/python3/subvertpy/py_fixup.h:117: multiple
> definition of `Text_Size'
> build/temp.linux-x86_64-3.2/subvertpy/client.o:/home/jelmer/src/subvertpy/pyth
> on3/subvertpy/py_fixup.h:117: first defined here

Revision history for this message
Yonggang Luo (luoyonggang) wrote : Posted in a previous version of this proposal

> * subvertpy is compatible back to python 2.4 - please use "from subvertpy
> import client" rather than "from . import client"
According to http://www.python.org/dev/peps/pep-0328/ . Python 2.4 support relative import. Is there anything wrong here?

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Posted in a previous version of this proposal

On 02/14/2012 06:11 PM, Yonggang Luo wrote:
>> * subvertpy is compatible back to python 2.4 - please use "from subvertpy
>> import client" rather than "from . import client"
> According to http://www.python.org/dev/peps/pep-0328/ . Python 2.4 support relative import. Is there anything wrong here?
 My bad, I thought it was introduced only in 2.5. Sorry, ignore that remark.

Cheers,

Jelmer

lp://staging/~luoyonggang/subvertpy/python3 updated
2438. By Yonggang Luo

Update Build instructions for Windows.

2439. By Yonggang Luo

Use relative import

2440. By Yonggang Luo

Install dlls without hacks.

2441. By Yonggang Luo

Ignore dlls, ignore eclipse project files.

2442. By Yonggang Luo

Now we can running unittest without install.

2443. By Yonggang Luo

Add def write_file(self, filename, content):
for close file properly.

2444. By Yonggang Luo

Merge mainline.

2445. By Yonggang Luo

Under windows, local file system url should be file:///

2446. By Yonggang Luo

Force remove files by dealing with errors.

2447. By Yonggang Luo

Update setup.py

2448. By Yonggang Luo

Update something.

2449. By Yonggang Luo

Merge mainline.

2450. By Yonggang Luo

Do something meaning full.

2451. By Yonggang Luo

Get it to be compiled.

2452. By Yonggang Luo

Python 3 styles.

2453. By Yonggang Luo

It's always UTF8.

2454. By Yonggang Luo

No encode utf8

2455. By Yonggang Luo

file content is binary data. keys sorted to list

2456. By Yonggang Luo

Bytes always return b''.
UTF8 is default for property.

2457. By Yonggang Luo

Revert something.

2458. By Yonggang Luo

Content always are binary data.

2459. By Yonggang Luo

Now it's tempfile.

2460. By Yonggang Luo

content are binary data.

2461. By Yonggang Luo

http://bugs.python.org/issue11587

2462. By Yonggang Luo

http://stackoverflow.com/questions/7807855/os-tmpfile-doesnt-work-under-windows

2463. By Yonggang Luo

Get temp directory properly.

2464. By Yonggang Luo

contents is binary data.

2465. By Yonggang Luo

digest is Bytes.

2466. By Yonggang Luo

content is binary.

2467. By Yonggang Luo

Handle tempfile properly.

2468. By Yonggang Luo

test diff properly.

2469. By Yonggang Luo

assertEquals -> assertEqual
assert_ -> assertTrue

2470. By Yonggang Luo

Merge mainline again.

2471. By Yonggang Luo

Merge mainline

2472. By Yonggang Luo

can pass custom test now.

2473. By Yonggang Luo

Get unit test to be passed.

2474. By Yonggang Luo

Remove unecessary file close.

2475. By Yonggang Luo

Remove unecessary file seek.

2476. By Yonggang Luo

.....More readable.

2477. By Yonggang Luo

Use addCleanup instead directly close.

2478. By Yonggang Luo

enhance PyOS_tmpfile.

2479. By Yonggang Luo

simplify the logic of py_open_tmp_file by using of
enhanced apr_file_t *apr_file_from_object(PyObject *object, apr_pool_t *pool)

2480. By Yonggang Luo

Remove trailling space.

2481. By Yonggang Luo

merge duplicated code.

2482. By Yonggang Luo

comment update.

2483. By Yonggang Luo

Directly copy the binary files to build directory.

2484. By Yonggang Luo

more comments.

2485. By Yonggang Luo

Use svn_dirent_internal_style and svn_dirent_local_style instead svn_path_canonicalize, because under win32
the svn internal path is differ win32 local path,
such as C:\Path\To\Repos,
the win32 local path representation is C:\Path\To\Repos
but the svn internal path representation is C:/Path/To/Repos, so we need
use svn_dirent_internal_style and svn_dirent_local_style

2486. By Yonggang Luo

before svn 1.6, there is no svn_dirent_internal_style and svn_dirent_local_style

2487. By Yonggang Luo

Py_DECREF ret

2488. By Yonggang Luo

use svn_dirent_internal_style and svn_dirent_local_style

2489. By Yonggang Luo

set sys.path in the right way.

Unmerged revisions

2489. By Yonggang Luo

set sys.path in the right way.

2488. By Yonggang Luo

use svn_dirent_internal_style and svn_dirent_local_style

2487. By Yonggang Luo

Py_DECREF ret

2486. By Yonggang Luo

before svn 1.6, there is no svn_dirent_internal_style and svn_dirent_local_style

2485. By Yonggang Luo

Use svn_dirent_internal_style and svn_dirent_local_style instead svn_path_canonicalize, because under win32
the svn internal path is differ win32 local path,
such as C:\Path\To\Repos,
the win32 local path representation is C:\Path\To\Repos
but the svn internal path representation is C:/Path/To/Repos, so we need
use svn_dirent_internal_style and svn_dirent_local_style

2484. By Yonggang Luo

more comments.

2483. By Yonggang Luo

Directly copy the binary files to build directory.

2482. By Yonggang Luo

comment update.

2481. By Yonggang Luo

merge duplicated code.

2480. By Yonggang Luo

Remove trailling space.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: