aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2012-06-26 17:53:53 +0200
committerAndré Erdmann <dywi@mailerd.de>2012-06-26 17:53:53 +0200
commitb866245c1503fe74352cbbae85ec5ab4108e5f7e (patch)
treeffd1f9ac8124a54208bb7a3319616a6e3647b43f /roverlay/remote
parenttest scripts (diff)
downloadR_overlay-b866245c1503fe74352cbbae85ec5ab4108e5f7e.tar.gz
R_overlay-b866245c1503fe74352cbbae85ec5ab4108e5f7e.tar.bz2
R_overlay-b866245c1503fe74352cbbae85ec5ab4108e5f7e.zip
use parser.get without fallback keyword
* using get (configparser) without the fallback keyword if python version is < 3.2 modified: roverlay/remote/repoloader.py
Diffstat (limited to 'roverlay/remote')
-rw-r--r--roverlay/remote/repoloader.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/roverlay/remote/repoloader.py b/roverlay/remote/repoloader.py
index 94dd5b7..cd7c9fc 100644
--- a/roverlay/remote/repoloader.py
+++ b/roverlay/remote/repoloader.py
@@ -1,4 +1,4 @@
-
+import sys
import logging
try:
@@ -33,7 +33,12 @@ def read_repofile ( repo_file, lenient=False ):
for name in parser.sections():
- get = lambda a, b=None : parser.get ( name, a, raw=True, fallback=b )
+ if sys.version_info < ( 3, 2 ):
+ # FIXME replace this and use more accurate version condition
+ get = lambda a, b=None: parser.get ( name, a, raw=True ) \
+ if parser.has_option ( name, a ) else b
+ else:
+ get = lambda a, b=None : parser.get ( name, a, raw=True, fallback=b )
repo_type = get ( 'type', 'rsync' ).lower()