Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 python-protorpc-standalone (0.9.1-1) unstable; urgency=medium
 .
   * Initial release. (Closes: #759385)
Author: Thomas Goirand <zigo@debian.org>
Bug-Debian: https://bugs.debian.org/759385

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- python-protorpc-standalone-0.9.1.orig/protorpc/_google/net/proto/ProtocolBuffer.py
+++ python-protorpc-standalone-0.9.1/protorpc/_google/net/proto/ProtocolBuffer.py
@@ -577,15 +577,15 @@ class Decoder:
       result |= (long(b & 127) << shift)
       shift += 7
       if not (b & 128):
-        if result >= 0x10000000000000000L:
+        if result >= 0x10000000000000000:
           raise ProtocolBufferDecodeError("corrupted")
         break
       if shift >= 64: raise ProtocolBufferDecodeError("corrupted")
       b = self.get8()
 
-    if result >= 0x8000000000000000L:
-      result -= 0x10000000000000000L
-    if result >= 0x80000000L or result < -0x80000000L:
+    if result >= 0x8000000000000000:
+      result -= 0x10000000000000000
+    if result >= 0x80000000 or result < -0x80000000:
       raise ProtocolBufferDecodeError("corrupted")
     return result
 
--- python-protorpc-standalone-0.9.1.orig/protorpc/transport.py
+++ python-protorpc-standalone-0.9.1/protorpc/transport.py
@@ -405,7 +405,7 @@ class LocalTransport(Transport):
       except:
         exc_type, exc_value, traceback = sys.exc_info()
         message = 'Unexpected error %s: %s' % (exc_type.__name__, exc_value)
-        raise remote.ServerError, message, traceback
+        raise remote.ServerError(message)
       rpc.set_response(response)
     rpc._wait_impl = wait_impl
     return rpc