Merge lp:~elachuni/wsgi-oops/no-more-twisted into lp:wsgi-oops

[Anthony Lenton]

[Anthony Lenton (elachuni)]

This branch removes the dependency on twisted by providing our own unsignedID.

The code is taken literally from twisted so it should be completely backwards compatible, not need new tests or break existing ones.

[Rick McBride (rmcbride)]

Cool! you had me from the words "No More Twisted"

tests pass with the code checked into tree.

review: Approve

[Elliot Murphy (statik)]

On Tue, Feb 16, 2010 at 4:01 PM, Anthony Lenton
<email address hidden> wrote:
> The code is taken literally from twisted so it should be completely backwards compatible, not need new tests or break existing ones.

What does this mean for copyright? Who has copyright on the code that
was added? Or did you just re-implement this simple function yourself,
and the way that twisted had done it was the obvious way to write the
code?

I ask because I think Canonical requires that we maintain 100%
copyright over projects where we are the primary authors, so I want to
be careful about introducing code that is not accompanied by a
copyright assignment.
--
Elliot Murphy | https://launchpad.net/~statik/

[Eric Casteleijn (thisfred)]

Awesome!

review: Approve

[Anthony Lenton (elachuni)]

> On Tue, Feb 16, 2010 at 4:01 PM, Elliot Murphy wrote:
> <email address hidden> wrote:
> > The code is taken literally from twisted so it should be completely
> backwards compatible, not need new tests or break existing ones.
>
> What does this mean for copyright? Who has copyright on the code that
> was added? Or did you just re-implement this simple function yourself,
> and the way that twisted had done it was the obvious way to write the
> code?

This branch just copied the function over, docstrings, comments and all. The only clear advantage of this way was that it would be real easy to convince people that it doesn't break any tests; we could reimplement it quickly, inline it or rewrite it as a lambda.

Let me know if we'd need to change the code.

=== modified file 'canonical/oops/oops.py'
--- canonical/oops/oops.py	2009-09-18 18:21:21 +0000
+++ canonical/oops/oops.py	2010-02-16 21:01:11 +0000
@@ -24,8 +24,21 @@
 import sys
 import StringIO
 
-from twisted.python.util import unsignedID
-
+# Taken from twisted.python.util.
+#
+# A value about twice as large as any Python int, to which negative values
+# from id() will be added, moving them into a range which should begin just
+# above where positive values from id() leave off.
+_HUGEINT = (sys.maxint + 1L) * 2L
+def unsignedID(obj):
+    """
+    Return the id of an object as an unsigned number so that its hex
+    representation makes sense
+    """
+    rval = id(obj)
+    if rval < 0:
+        rval += _HUGEINT
+    return rval
 
 class OOPSEntryError(Exception):
     """Raised when the entry_name added already exists in the OOPS."""