commit: e5aeb45de0db5912b57f1574562fc7d474afaa67 Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org> AuthorDate: Fri Jun 6 21:18:14 2014 +0000 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> CommitDate: Sat Jun 14 22:07:34 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=e5aeb45d
Various syntax fixes Fixes to docstring indentation, output messages, and function definition syntax. --- layman/api.py | 6 +++--- layman/overlays/bzr.py | 8 ++++---- layman/overlays/git.py | 8 ++++---- layman/overlays/mercurial.py | 8 ++++---- layman/overlays/svn.py | 8 ++++---- layman/repoconfmanager.py | 30 +++++++++++++++--------------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/layman/api.py b/layman/api.py index d9d3eb1..1d50adf 100755 --- a/layman/api.py +++ b/layman/api.py @@ -333,7 +333,7 @@ class LaymanAPI(object): '\n'\ ' %(remote_type)s\n'\ '\n'\ - 'the overlay will be readded using %(remote_name)s' % + 'the overlay will be readded using %(remote_name)s' %\ ({ 'repo_name': odb.name, 'current_type': current_type, @@ -342,7 +342,7 @@ class LaymanAPI(object): return True, msg return False, '' - def _verify_overlay_source(self, odb, ordb) + def _verify_overlay_source(self, odb, ordb): """ Verifies the overlay source url against the source url(s) reported by the remote database. @@ -367,7 +367,7 @@ class LaymanAPI(object): msg = 'The source of the overlay "%(repo_name)s" seems to have changed.\n'\ 'You currently sync from\n'\ '\n'\ - ' %(current_src)s\n' + ' %(current_src)s\n'\ '\n'\ 'while the remote lists report\n'\ '\n'\ diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py index 20d2491..162ba40 100644 --- a/layman/overlays/bzr.py +++ b/layman/overlays/bzr.py @@ -50,11 +50,11 @@ class BzrOverlay(OverlaySource): self.subpath = None def _fix_bzr_source(self, source): - ''' - Adds trailing slash to source URL if needed. + ''' + Adds trailing slash to source URL if needed. - @params source: source URL, string. - ''' + @params source: source URL, string. + ''' if source.endswith("/"): return source return source + '/' diff --git a/layman/overlays/git.py b/layman/overlays/git.py index ee8c53b..5e99a65 100644 --- a/layman/overlays/git.py +++ b/layman/overlays/git.py @@ -47,11 +47,11 @@ class GitOverlay(OverlaySource): self.subpath = None def _fix_git_source(self, source): - ''' - Adds trailing slash to http sources + ''' + Adds trailing slash to http sources - @param source: source URL, string. - ''' + @param source: source URL, string. + ''' # http:// should get trailing slash, other protocols shouldn't if source.split(':')[:1] == 'http': if not source.endswith('/'): diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py index 74f1934..9f7d45c 100644 --- a/layman/overlays/mercurial.py +++ b/layman/overlays/mercurial.py @@ -51,11 +51,11 @@ class MercurialOverlay(OverlaySource): self.subpath = None def _fix_mercurial_source(self, source): - ''' - Adds trailing slash to source URL if needed. + ''' + Adds trailing slash to source URL if needed. - @params source: source URL, string. - ''' + @params source: source URL, string. + ''' if source.endswith("/"): return source return source + '/' diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py index f494eba..41dd862 100644 --- a/layman/overlays/svn.py +++ b/layman/overlays/svn.py @@ -54,11 +54,11 @@ class SvnOverlay(OverlaySource): self.subpath = None def _fix_svn_source(self, source): - ''' - Adds @ to all sources that don't already include it. + ''' + Adds @ to all sources that don't already include it. - @params source: source URL, string. - ''' + @params source: source URL, string. + ''' if source.endswith("/"): source = source + '@' else: diff --git a/layman/repoconfmanager.py b/layman/repoconfmanager.py index 502dc2a..415a454 100644 --- a/layman/repoconfmanager.py +++ b/layman/repoconfmanager.py @@ -44,12 +44,12 @@ class RepoConfManager: def add(self, overlay): - ''' - Adds overlay information to the specified config type(s). + ''' + Adds overlay information to the specified config type(s). - @param overlay: layman.overlay.Overlay instance. - @return boolean: represents success or failure. - ''' + @param overlay: layman.overlay.Overlay instance. + @return boolean: represents success or failure. + ''' if self.config['require_repoconfig']: for types in self.conf_types: conf = getattr(self.modules[types][0], @@ -59,12 +59,12 @@ class RepoConfManager: return True def delete(self, overlay): - ''' - Deletes overlay information from the specified config type(s). + ''' + Deletes overlay information from the specified config type(s). - @param overlay: layman.overlay.Overlay instance. - @return boolean: represents success or failure. - ''' + @param overlay: layman.overlay.Overlay instance. + @return boolean: represents success or failure. + ''' if self.config['require_repoconfig']: for types in self.conf_types: conf = getattr(self.modules[types][0], @@ -75,12 +75,12 @@ class RepoConfManager: def update(self, overlay): - ''' - Updates the source URL for the specified config type(s). + ''' + Updates the source URL for the specified config type(s). - @param overlay: layman.overlay.Overlay instance. - @return boolean: represents success or failure. - ''' + @param overlay: layman.overlay.Overlay instance. + @return boolean: represents success or failure. + ''' if self.config['require_repoconfig']: for types in self.conf_types: conf = getattr(self.modules[types][0],