summaryrefslogtreecommitdiff
path: root/morphlib/repoaliasresolver.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-07-31 12:52:12 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-08-01 13:12:03 +0000
commit0032ccbd60f202ec76d9b738cddc8bdbf9f54133 (patch)
treecd398ab063be0bdab20b91cbd2420ad4981de813 /morphlib/repoaliasresolver.py
parent93a3d28ee51cc301cd79ff8bfabb2010defda09b (diff)
downloadmorph-0032ccbd60f202ec76d9b738cddc8bdbf9f54133.tar.gz
python scripts: pep8ize codebase
This was done with the aid of the pep8 script, available by running `easy_install pep8`. It may be worth making this part of ./check, but that will require putting pep8 into the development tools stratum. This should be easy, given pep8 has no external dependencies.
Diffstat (limited to 'morphlib/repoaliasresolver.py')
-rw-r--r--morphlib/repoaliasresolver.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/morphlib/repoaliasresolver.py b/morphlib/repoaliasresolver.py
index 3daf34dd..731c1a76 100644
--- a/morphlib/repoaliasresolver.py
+++ b/morphlib/repoaliasresolver.py
@@ -1,14 +1,14 @@
# Copyright (C) 2012 Codethink Limited
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -57,15 +57,15 @@ class RepoAliasResolver(object):
return self._apply_url_pattern(pullpat, suffix)
# Unknown prefix. Which means it may be a real URL instead.
- # Let the caller deal with it.
+ # Let the caller deal with it.
logging.debug('expanding: unknown prefix')
return reponame
-
+
def _split_reponame(self, reponame):
'''Split reponame into prefix and suffix.
-
+
The prefix is returned as None if there was no prefix.
-
+
'''
pat = r'^(?P<prefix>[a-z0-9]+):(?P<rest>.*)$'
@@ -74,10 +74,9 @@ class RepoAliasResolver(object):
return m.group('prefix'), m.group('rest')
else:
return None, reponame
-
+
def _apply_url_pattern(self, pattern, shortname):
if '%s' in pattern:
return shortname.join(pattern.split('%s'))
else:
return pattern + shortname
-