x/solar
Code Issues Proposed changes

Replace Bunch with Munch package

Browse Source 
Munch is fork of Bunch. Munch is still maintained and already packaged
on Centos.

Change-Id: I4044acd4467b364bb8e68c2e02db59f60a5c8ed1
This commit is contained in:
Jedrzej Nowak 2016-02-26 20:34:11 +01:00 committed by Lukasz Oles
parent 086a3e28c3
commit 80ca0e1707
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -34,7 +34,7 @@ zerorpc>=0.5.2
# Packages beyond this comment are not in OS Global Requirements # Packages beyond this comment are not in OS Global Requirements
bunch>=1.0.1 munch>=1.0.1
click>=6.2 click>=6.2
dictdiffer>=0.4.0 dictdiffer>=0.4.0
Fabric>=1.10.2 Fabric>=1.10.2

6
solar/config.py
View File

@ -16,14 +16,14 @@
import os import os
from bunch import Bunch from munch import Munch
import yaml import yaml
CWD = os.getcwd() CWD = os.getcwd()
C = Bunch(solar_db="") C = Munch(solar_db="")
C.riak_ensemble = False C.riak_ensemble = False
C.lock_bucket_type = None C.lock_bucket_type = None
C.counter_bucket_type = None C.counter_bucket_type = None
@ -45,7 +45,7 @@ def _lookup_vals(setter, config, prefix=None):
sub = [key] sub = [key]
else: else:
sub = prefix + [key] sub = prefix + [key]
if isinstance(val, Bunch): if isinstance(val, Munch):
_lookup_vals(setter, val, sub) _lookup_vals(setter, val, sub)
else: else:
setter(config, sub) setter(config, sub)

4
solar/utils.py
View File

@ -23,8 +23,8 @@ import threading
import urlparse import urlparse
import uuid import uuid
from bunch import Bunch
from jinja2 import Environment from jinja2 import Environment
from munch import Munch
import yaml import yaml
@ -168,7 +168,7 @@ def parse_database_conn(name):
if m is not None: if m is not None:
groups = m.groupdict() groups = m.groupdict()
groups['type'] = 'riak' if groups['mode'] == 'riak' else 'sql' groups['type'] = 'riak' if groups['mode'] == 'riak' else 'sql'
return Bunch(groups), Bunch(opts) return Munch(groups), Munch(opts)
else: else:
raise Exception("Invalid database connection string: %r " raise Exception("Invalid database connection string: %r "
"It should be in RFC 1738 format. " % name) "It should be in RFC 1738 format. " % name)

2
specs/solar.spec
View File

@ -20,7 +20,7 @@ BuildArch: noarch
Requires: ansible >= 2.0 Requires: ansible >= 2.0
Requires: python Requires: python
Requires: python-fabric >= 1.10.2 Requires: python-fabric >= 1.10.2
Requires: python-bunch Requires: python-munch
Requires: python-click >= 6 Requires: python-click >= 6
Requires: python-dictdiffer >= 0.4.0 Requires: python-dictdiffer >= 0.4.0
Requires: python-enum34 >= 1.0.4 Requires: python-enum34 >= 1.0.4