Merge ~cjwatson/launchpad:fix-translation-sharing-job-derived into launchpad:master

[Colin Watson]

Regularise TranslationSharingJobDerived slightly

This makes it a little more like other job classes, and in particular arranges that .job.id on its subclasses that implement IRunnableJob will refer to the ID of a Job table and not something else.

I ran into trouble with the slightly dodgy old approach while trying to fix BaseRunnableJob to work with transaction 3.0.0.

[Tom Wardill (twom)]

review: Approve

diff --git a/lib/lp/translations/interfaces/translationsharingjob.py b/lib/lp/translations/interfaces/translationsharingjob.py
index 7989eb6..82478d6 100644
--- a/lib/lp/translations/interfaces/translationsharingjob.py
+++ b/lib/lp/translations/interfaces/translationsharingjob.py
@@ -3,6 +3,7 @@
 
 __metaclass__ = type
 
+from lazr.restful.fields import Reference
 from zope.interface import Attribute
 
 from lp import _
@@ -11,6 +12,10 @@ from lp.services.job.interfaces.job import IJob
 
 class ITranslationSharingJob(IJob):
 
+    job = Reference(
+        title=_("The common Job attributes."), schema=IJob,
+        required=True, readonly=True)
+
     productseries = Attribute(_("The productseries of the Packaging."))
 
     distroseries = Attribute(_("The distroseries of the Packaging."))
diff --git a/lib/lp/translations/model/translationsharingjob.py b/lib/lp/translations/model/translationsharingjob.py
index e09a95e..80cdad4 100644
--- a/lib/lp/translations/model/translationsharingjob.py
+++ b/lib/lp/translations/model/translationsharingjob.py
@@ -113,7 +113,7 @@ class TranslationSharingJob(StormBase):
         return TranslationSharingJobDerived.makeSubclass(self)
 
 
-@delegate_to(ITranslationSharingJob, context='job')
+@delegate_to(ITranslationSharingJob)
 class TranslationSharingJobDerived:
     """Base class for specialized TranslationTemplate Job types."""
 
@@ -143,7 +143,7 @@ class TranslationSharingJobDerived:
         assert job.job_type == self.class_job_type, (
             "Attempting to create a %s using a %s TranslationSharingJob" %
             (self.__class__.__name__, job.job_type))
-        self.job = job
+        self.context = job
 
     @classmethod
     def create(cls, productseries=None, distroseries=None,