Merge lp:~jameinel/launchpadlib/win32 into lp:~launchpad-pqm/launchpadlib/devel

[John A Meinel]

[John A Meinel (jameinel)]

This gets rid of the "bootstrap.py" symlink in favor of a trivial python file that just thunks over to _bootstrap/bootstrap.py

With this patch, I can check out the code on windows, and "py setup.py install" downloads a bunch of stuff and completes successfully.

I don't know if the code is usable yet, but it at least *installs*.

[John A Meinel (jameinel)]

I found that there is another failure condition, which was pretty easy to fix.

So this patch does:

1) Change the symlink bootstrap.py into a trivial boostrap.py script that just thunks into the real _bootstrap/bootstrap.py
2) Change a trap for:
  if isinstance(cache, str):
to
  if isinstance(cache, basestring):

This is because "tempfile.mkdtemp()" on win32 returns a Unicode string. (Since the underlying filesystem is UTF-16 it makes sense to do so.)

[Leonard Richardson (leonardr)]

This looks good and works for me. However, if we're going to do this I wonder if it might make sense to just move _bootstrap/bootstrap.py into the top-level directory. That also seems to work, and it's less code. Approved* pending Gary's (probably negative) opinion of that idea.

review: Approve

[Gary Poster (gary)]

> This looks good and works for me. However, if we're going to do this I wonder
> if it might make sense to just move _bootstrap/bootstrap.py into the top-level
> directory. That also seems to work, and it's less code. Approved* pending
> Gary's (probably negative) opinion of that idea.

My only concern is actually a legal one. I was keeping (trying to keep) the ZPL bits (including the license itself) down in that directory for legal cleanliness.

Another, similar approach would be to remove the top-level bootstrap.py, move _bootstrap dir -> bootstrap, and have the instructions be to run bootstrap/bootstrap.py. As another alternative, we can go for cutesy, like boot/strap.py.

I don't care if we do what you propose though (and that's what I do when the whole package is ZPL), especially if kfogel or someone similarly comfortable with opinions about license stuff like this approves.

[Karl Fogel (kfogel)]

As long as it's ZPL 2.0 or 2.1, it's fine. We can ship with code copyrighted by others in our tree, as long as the license is AGPLv3-compatible. ZPL 1 is not, but 2.0 and 2.1 are, according to

  http://www.gnu.org/philosophy/license-list.html#Zope20

and also according to the ZPL itself:

  http://www.zope.org/Resources/ZPL

(Note it just claims compatibility with the "GPL", but you can see by reading the license that it's AGPLv3-compatible.)

So, I think you should do whatever is technically best, and not worry about the license. There's other stuff in our tree that is under other free software licenses; compatibility with AGPLv3 is our only concern -- we don't actually have to be the copyright holder in every case.

[Paul Hummer (rockstar)]

review: Approve

[Paul Hummer (rockstar)]

What's the status of this branch? The proposal is more than a year old.

[John A Meinel (jameinel)]

Consider it either merged or rejected. Someone got rid of the symlink in the working dir, so you can checkout launchpadlib on Windows, I don't know whether they used my version or not.

It looks like the change was this one:
  45 Leonard Richardson 2009-07-09
     Moved bootstrap.py up one directory.

And the other fix... there doesn't seem to be a matching mkdtemp call anymore, so it probably doesn't matter either.

Unmerged revisions

44. By John A Meinel on 2009-07-09

Handle another failure condition on win32.

It seems that 'mkdtemp()' will return a Unicode string on windows,
and launchpadlib was only trapping plain 'str' objects to turn them
into MultipleRepresentationCache objects.

43. By John A Meinel on 2009-07-09

Get rid of subprocess in favor of updating sys.path and just doing 'import'

42. By John A Meinel on 2009-07-09

Remove the symlink and replace it with a trivial subprocess invocation.

=== added file 'bootstrap.py'
--- bootstrap.py	1970-01-01 00:00:00 +0000
+++ bootstrap.py	2009-07-09 14:02:54 +0000
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+"""A trivial thunk to call the real bootstrap without needing a symlink."""
+import os
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '_bootstrap'))
+import bootstrap

=== removed symlink 'bootstrap.py'
=== target was '_bootstrap/bootstrap.py'
=== modified file 'src/launchpadlib/_browser.py'
--- src/launchpadlib/_browser.py	2009-03-20 20:46:06 +0000
+++ src/launchpadlib/_browser.py	2009-07-09 15:34:19 +0000
@@ -187,7 +187,7 @@
         if cache is None:
             cache = tempfile.mkdtemp()
             atexit.register(shutil.rmtree, cache)
-        if isinstance(cache, str):
+        if isinstance(cache, basestring): # On win32 mkdtemp returns Unicode
             cache = MultipleRepresentationCache(cache)
         self._connection = OAuthSigningHttp(
             credentials, cache, timeout, proxy_info)