From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 073F213877A for ; Mon, 16 Jun 2014 03:37:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30587E0BBE; Mon, 16 Jun 2014 03:37:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E647E0BA8 for ; Mon, 16 Jun 2014 03:37:33 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1247233FE8C for ; Mon, 16 Jun 2014 03:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 72EAB187DE for ; Mon, 16 Jun 2014 03:37:29 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402783654.e5aeb45de0db5912b57f1574562fc7d474afaa67.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:gsoc2014 commit in: layman/overlays/, layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/api.py layman/overlays/bzr.py layman/overlays/git.py layman/overlays/mercurial.py layman/overlays/svn.py layman/repoconfmanager.py X-VCS-Directories: layman/overlays/ layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e5aeb45de0db5912b57f1574562fc7d474afaa67 X-VCS-Branch: gsoc2014 Date: Mon, 16 Jun 2014 03:37:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 49944694-2c67-4aa2-b790-06e83eadd392 X-Archives-Hash: 085a83324ad5923df962a5cc6831eac1 commit: e5aeb45de0db5912b57f1574562fc7d474afaa67 Author: Devan Franchini gentoo org> AuthorDate: Fri Jun 6 21:18:14 2014 +0000 Commit: Brian Dolbec gmail 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], From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 52DFC13877A for ; Mon, 16 Jun 2014 03:40:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BB6DE0B8E; Mon, 16 Jun 2014 03:40:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18367E0B8C for ; Mon, 16 Jun 2014 03:40:23 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D191633F8BB for ; Mon, 16 Jun 2014 03:40:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 44F9F187DE for ; Mon, 16 Jun 2014 03:40:19 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1402783654.e5aeb45de0db5912b57f1574562fc7d474afaa67.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/api.py layman/overlays/bzr.py layman/overlays/git.py layman/overlays/mercurial.py layman/overlays/svn.py layman/repoconfmanager.py X-VCS-Directories: layman/overlays/ layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e5aeb45de0db5912b57f1574562fc7d474afaa67 X-VCS-Branch: master Date: Mon, 16 Jun 2014 03:40:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 238d7e0b-6b76-435d-9eb1-8e34f4926afc X-Archives-Hash: f2d8f8d05499cf0b653ee793dd810e0f Message-ID: <20140616034019.rPy0M4zjGcoTMfvfVRwlUdt0bHmzRKEGEO3BK9YOoS0@z> commit: e5aeb45de0db5912b57f1574562fc7d474afaa67 Author: Devan Franchini gentoo org> AuthorDate: Fri Jun 6 21:18:14 2014 +0000 Commit: Brian Dolbec gmail 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],