Bug 1536103 - Fix Sphinx Warning - Unexpected indentation (1). r=ahal
authorchampionshuttler <shivams2799@gmail.com>
Fri, 28 Jun 2019 18:33:19 +0000
changeset 543427 97b7600d3c92a537ef29f7f25e3583de0fa90a10
parent 543426 3669b147ccc6d3c10f742e6b72efcf9dbda99374
child 543428 61c481e2d2e8082522ed1f202a5c6157f203b333
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersahal
bugs1536103
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1536103 - Fix Sphinx Warning - Unexpected indentation (1). r=ahal Differential Revision: https://phabricator.services.mozilla.com/D35304
python/mozbuild/mozbuild/android_version_code.py
python/mozbuild/mozpack/chrome/flags.py
python/mozbuild/mozpack/chrome/manifest.py
--- a/python/mozbuild/mozbuild/android_version_code.py
+++ b/python/mozbuild/mozbuild/android_version_code.py
@@ -29,17 +29,16 @@ def android_version_code_v0(buildid, cpu
         return base + min_sdk + 3
     else:
         raise ValueError("Don't know how to compute android:versionCode "
                          "for CPU arch %s" % cpu_arch)
 
 
 def android_version_code_v1(buildid, cpu_arch=None, min_sdk=0, max_sdk=0):
     '''Generate a v1 android:versionCode.
-
     The important consideration is that version codes be monotonically
     increasing (per Android package name) for all published builds.  The input
     build IDs are based on timestamps and hence are always monotonically
     increasing.
 
     The generated v1 version codes look like (in binary):
 
     0111 1000 0010 tttt tttt tttt tttt txpg
@@ -49,16 +48,17 @@ def android_version_code_v1(buildid, cpu
     little under 15 years worth of hourly build identifiers, since 2**17 / (366
     * 24) =~ 14.92.
 
     The bits labelled 'x', 'p', and 'g' are feature flags.
 
     The bit labelled 'x' is 1 if the build is for an x86 or x86-64 architecture,
     and 0 otherwise, which means the build is for an ARM or ARM64 architecture.
     (Fennec no longer supports ARMv6, so ARM is equivalent to ARMv7.
+
      ARM64 is also known as AArch64; it is logically ARMv8.)
 
     For the same release, x86 and x86_64 builds have higher version codes and
     take precedence over ARM builds, so that they are preferred over ARM on
     devices that have ARM emulation.
 
     The bit labelled 'p' is 1 if the build is for a 64-bit architecture (x86-64
     or ARM64), and 0 otherwise, which means the build is for a 32-bit
--- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py
@@ -95,16 +95,17 @@ class StringFlag(object):
         else:
             return errors.fatal('Malformed flag: %s' % definition)
 
     def matches(self, value):
         '''
         Return whether one of the string flag definitions matches the given
         value.
         For example,
+
             flag = StringFlag('foo')
             flag.add_definition('foo!=bar')
             flag.matches('bar') returns False
             flag.matches('qux') returns True
             flag = StringFlag('foo')
             flag.add_definition('foo=bar')
             flag.add_definition('foo=baz')
             flag.matches('bar') returns True
@@ -170,16 +171,17 @@ class VersionFlag(object):
         else:
             return errors.fatal('Malformed flag: %s' % definition)
 
     def matches(self, value):
         '''
         Return whether one of the version flag definitions matches the given
         value.
         For example,
+
             flag = VersionFlag('foo')
             flag.add_definition('foo>=1.0')
             flag.matches('1.0') returns True
             flag.matches('1.1') returns True
             flag.matches('0.9') returns False
             flag = VersionFlag('foo')
             flag.add_definition('foo>=1.0')
             flag.add_definition('foo<0.5')
@@ -211,16 +213,17 @@ class VersionFlag(object):
     def __eq__(self, other):
         return str(self) == other
 
 
 class Flags(OrderedDict):
     '''
     Class to handle a set of flags definitions given on a single manifest
     entry.
+
     '''
     FLAGS = {
         'application': StringFlag,
         'appversion': VersionFlag,
         'platformversion': VersionFlag,
         'contentaccessible': Flag,
         'os': StringFlag,
         'osversion': VersionFlag,
@@ -254,18 +257,20 @@ class Flags(OrderedDict):
         '''
         return ' '.join(str(self[k]) for k in self)
 
     def match(self, **filter):
         '''
         Return whether the set of flags match the set of given filters.
             flags = Flags('contentaccessible=yes', 'appversion>=3.5',
                           'application=foo')
+
             flags.match(application='foo') returns True
             flags.match(application='foo', appversion='3.5') returns True
             flags.match(application='foo', appversion='3.0') returns False
+
         '''
         for name, value in six.iteritems(filter):
             if name not in self:
                 continue
             if not self[name].matches(value):
                 return False
         return True
--- a/python/mozbuild/mozpack/chrome/manifest.py
+++ b/python/mozbuild/mozpack/chrome/manifest.py
@@ -12,16 +12,17 @@ from mozpack.chrome.flags import Flags
 from mozpack.errors import errors
 from six.moves.urllib.parse import urlparse
 
 
 class ManifestEntry(object):
     '''
     Base class for all manifest entry types.
     Subclasses may define the following class or member variables:
+
         - localized: indicates whether the manifest entry is used for localized
           data.
         - type: the manifest entry type (e.g. 'content' in
           'content global content/global/')
         - allowed_flags: a set of flags allowed to be defined for the given
           manifest entry type.
 
     A manifest entry is attached to a base path, defining where the manifest