diff options
| author | hut <hut@lavabit.com> | 2011-10-10 19:58:32 +0200 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2011-10-10 19:58:32 +0200 |
| commit | 97beb87a99c106402e43b6f0e43c8cec9bd26107 (patch) | |
| tree | 557b4e21dfb8ffa0351c9c44f97405d7e9190a8d /ranger | |
| parent | 1891697f0cb957fe12d4e8b941f2686ee90f4290 (diff) | |
| download | ranger-97beb87a99c106402e43b6f0e43c8cec9bd26107.tar.gz | |
core.actions: renamed Actions.source_cmdlist to Actions.source
Diffstat (limited to 'ranger')
| -rw-r--r-- | ranger/core/actions.py | 2 | ||||
| -rw-r--r-- | ranger/core/helper.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 83d3b201..a109a1d6 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -199,7 +199,7 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): return macros - def source_cmdlist(self, filename): + def source(self, filename): filename = os.path.expanduser(filename) for line in open(filename, 'r'): line = line.rstrip("\r\n") diff --git a/ranger/core/helper.py b/ranger/core/helper.py index dfc710c0..5c93a734 100644 --- a/ranger/core/helper.py +++ b/ranger/core/helper.py @@ -115,9 +115,9 @@ def load_settings(fm, clean): load_default_rc = custom_conf_size < default_conf_size - 2048 if load_default_rc: - fm.source_cmdlist(default_conf) + fm.source(default_conf) if os.access(custom_conf, os.R_OK): - fm.source_cmdlist(custom_conf) + fm.source(custom_conf) # Load plugins try: @@ -153,7 +153,7 @@ def load_settings(fm, clean): comcont.load_commands_from_object(fm, include) comcont.load_commands_from_module(commands) fm.commands = comcont - fm.source_cmdlist(fm.relpath('defaults', 'rc.conf')) + fm.source(fm.relpath('defaults', 'rc.conf')) fm.apps = apps.CustomApplications() |