← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/sourcepackage-display-name into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/sourcepackage-display-name into lp:launchpad.

Commit message:
Rename {DistributionSourcePackage,SourcePackage}.displayname to display_name, leaving properties behind for compatibility.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/sourcepackage-display-name/+merge/274167

Rename {DistributionSourcePackage,SourcePackage}.displayname to display_name, leaving properties behind for compatibility.

This follows https://code.launchpad.net/~cjwatson/launchpad/product-project-display-name/+merge/273112.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/sourcepackage-display-name into lp:launchpad.
=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2015-10-01 17:32:41 +0000
+++ lib/lp/registry/configure.zcml	2015-10-12 16:27:24 +0000
@@ -550,6 +550,7 @@
                 currentrelease
                 delete
                 development_version
+                display_name
                 displayname
                 distribution
                 distro

=== modified file 'lib/lp/registry/interfaces/distributionsourcepackage.py'
--- lib/lp/registry/interfaces/distributionsourcepackage.py	2015-02-26 11:34:47 +0000
+++ lib/lp/registry/interfaces/distributionsourcepackage.py	2015-10-12 16:27:24 +0000
@@ -59,9 +59,9 @@
 
     name = exported(
         TextLine(title=_("The source package name as text"), readonly=True))
-    displayname = exported(
-        TextLine(title=_("Display name for this package."), readonly=True),
-        exported_as="display_name")
+    display_name = exported(
+        TextLine(title=_("Display name for this package."), readonly=True))
+    displayname = Attribute('Display name (deprecated)')
     title = exported(
         TextLine(title=_("Title for this package."), readonly=True))
 

=== modified file 'lib/lp/registry/interfaces/sourcepackage.py'
--- lib/lp/registry/interfaces/sourcepackage.py	2015-09-28 17:38:45 +0000
+++ lib/lp/registry/interfaces/sourcepackage.py	2015-10-12 16:27:24 +0000
@@ -79,10 +79,13 @@
             title=_("Name"), required=True, readonly=True,
             description=_("The text name of this source package.")))
 
-    displayname = exported(
+    display_name = exported(
         TextLine(
             title=_("Display name"), required=True, readonly=True,
-            description=_("A displayname, constructed, for this package")))
+            description=_("A displayname, constructed, for this package")),
+        exported_as="displayname")
+
+    displayname = Attribute("Display name (deprecated)")
 
     path = Attribute("A path to this package, <distro>/<series>/<package>")
 

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2015-07-08 16:05:11 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2015-10-12 16:27:24 +0000
@@ -150,11 +150,13 @@
         return self.sourcepackagename.name
 
     @property
-    def displayname(self):
+    def display_name(self):
         """See `IDistributionSourcePackage`."""
         return '%s in %s' % (
             self.sourcepackagename.name, self.distribution.displayname)
 
+    displayname = display_name
+
     @property
     def bugtargetdisplayname(self):
         """See `IBugTarget`."""

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2015-07-08 16:05:11 +0000
+++ lib/lp/registry/model/sourcepackage.py	2015-10-12 16:27:24 +0000
@@ -286,11 +286,13 @@
             self.sourcepackagename.name])
 
     @property
-    def displayname(self):
+    def display_name(self):
         return "%s in %s %s" % (
             self.sourcepackagename.name, self.distribution.displayname,
             self.distroseries.displayname)
 
+    displayname = display_name
+
     @property
     def bugtargetdisplayname(self):
         """See IBugTarget."""


Follow ups