summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ranger/ext/openstruct.py25
-rw-r--r--ranger/gui/colorscheme.py1
2 files changed, 5 insertions, 21 deletions
diff --git a/ranger/ext/openstruct.py b/ranger/ext/openstruct.py
index 56f7de06..11363127 100644
--- a/ranger/ext/openstruct.py
+++ b/ranger/ext/openstruct.py
@@ -13,23 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-class OpenStruct(object):
-	def __init__(self, __dictionary=None, **__keywords):
-		if __dictionary:
-			self.__dict__.update(__dictionary)
-		if __keywords:
-			self.__dict__.update(__keywords)
-
-	def __getitem__(self, key):
-		return self.__dict__[key]
-
-	def __setitem__(self, key, value):
-		self.__dict__[key] = value
-		return value
-
-	def __contains__(self, key):
-		return key in self.__dict__
-
-class ReferencedOpenStruct(OpenStruct):
-	def __init__(self, dictionary):
-		self.__dict__ = dictionary
+class OpenStruct(dict):
+	"""The fusion of dict and struct"""
+	def __init__(self, *args, **keywords):
+		dict.__init__(self, *args, **keywords)
+		self.__dict__ = self
diff --git a/ranger/gui/colorscheme.py b/ranger/gui/colorscheme.py
index 867aec70..99ea6ff7 100644
--- a/ranger/gui/colorscheme.py
+++ b/ranger/gui/colorscheme.py
@@ -41,7 +41,6 @@ If your colorscheme-file contains more than one colorscheme, specify it with:
 colorscheme = colorschemes.filename.classname
 """
 
-from ranger.ext.openstruct import ReferencedOpenStruct
 from curses import color_pair
 from ranger.gui.color import get_color
 from ranger.gui.context import Context
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-17 13:39:46 +0000
cs/ranger/blame/Makefile?h=v1.8.1&id=fff320285cfd4844547afac4056b788b2db3a2ee'>^ 
e9e4b4ff ^








94c5d83e ^








76f8d548 ^




94c5d83e ^



423ce88a ^


94c5d83e ^









e9e4b4ff ^


50a0cb1c ^

e9e4b4ff ^


26aa5c8e ^

e9e4b4ff ^

fde932f2 ^

75682d43 ^

e9e4b4ff ^


2c5ea01d ^

e9e4b4ff ^





e9e4b4ff ^


2c5ea01d ^

e9e4b4ff ^

0c2c782d ^


30ae2137 ^

1

2

3
4
5

6

7

8
9
10

11

12
13

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28

29
30
31
32

33

34

35
36
37
38
39
40
41
42

43
44
45
46
47
48
49
50

51
52
53
54

55
56
57

58
59

60
61
62
63
64
65
66
67
68

69
70

71

72
73

74

75

76

77

78
79

80

81
82
83
84
85

86
87

88

89

90
91

92

             
               


                    
                   
                  


                                                                      
 

                                                              














                                                                          



                            
                                      
                                                                       







                                                  







                                                               



                                                                           


                                         

                                      








                                                                               

         
                                                      

      
                                                        
 
     
                        

     
                                                                                                             




                                              

            
            
                   

         
                                                                                                    
NAME = ranger
VERSION = 1.0.4
PYTHON ?= python
DOCDIR ?= doc/pydoc
PREFIX ?= /usr/local
PYTHONOPTIMIZE ?= 2
CWD = $(shell pwd)
EDITOR ?= vim
DEST ?= $(shell $(PYTHON) -c 'import sys; sys.stdout.write( \
	[p for p in sys.path if "site" in p][0])' 2> /dev/null)/ranger

.PHONY: all compile clean doc cleandoc edit push test commit \
	install uninstall info snapshot minimal_snapshot

info:
	@echo 'This makefile provides shortcuts for common tasks.'
	@echo 'make clean: Remove all unnecessary files (.pyc, .pyo)'
	@echo 'make cleandoc: Remove the pydoc documentation'
	@echo 'make doc: Create the pydoc documentation'
	@echo 'make install: Install ranger'
	@echo 'make snapshot: Create a tar.gz of the current git revision'
	@echo
	@echo 'For developers:'
	@echo 'make commit: Test and commit the changes'
	@echo 'make test: Run all unittests.'
	@echo 'make push: push the changes via git'
	@echo 'make edit: open all relevant files in your editor'

all: test install

compile: clean
	@echo 'Compiling...'
	python -m compileall -q ranger
	PYTHONOPTIMIZE=$(PYTHONOPTIMIZE) python -m compileall -q ranger

doc: cleandoc
	mkdir -p $(DOCDIR)
	cd $(DOCDIR); \
		$(PYTHON) -c 'import pydoc, sys; \
		sys.path[0] = "$(CWD)"; \
		pydoc.writedocs("$(CWD)")'

uninstall:
	@echo 'To uninstall ranger, please remove these files:'
	@echo $(DEST)'/*'
	@echo $(PREFIX)'/bin/ranger'
	@echo 'and optionally the config files at:'
	@echo '~/.ranger'

install: compile
	@if [ '$(DEST)' == '/ranger' ]; then \
		echo 'Cannot find a suitable destination for the files.'; \
		false; \
	fi
	@echo "Installing..."
	cp ranger.py $(PREFIX)/bin/ranger
	cp -ruT ranger $(DEST)
	chmod 755 $(PREFIX)/bin/ranger
	chmod -R +rX $(DEST)
	@echo '--------------------------------------'
	@echo 'Finished.'
	@echo 'If you use BASH or ZSH, you can activate an extra feature now:'
	@echo 'When you exit ranger, the directory of the current shell can be'
	@echo 'changed to the last visited directory in ranger.  To do so, add'
	@echo 'this alias to your shell rc file (like ~/.bashrc):'
	@echo 'alias rng="source ranger ranger"'
	@echo 'And run ranger by typing rng.'


cleandoc:
	test -d $(DOCDIR) && rm -f -- $(DOCDIR)/*.html

clean:
	find . -regex .\*.py[co]\$$ -exec rm -f -- {} \;

test:
	./all_tests.py 1

edit:
	@$(EDITOR) ranger.py Makefile README COPYING HACKING INSTALL $(shell find ranger test -regex .\*py$ )

push:
	@for repo in $(shell git remote); do \
		echo "Pushing to $$repo..."; \
		git push $$repo master; \
	done

commit: test
	@git citool

snapshot:
	git archive HEAD | gzip > $(NAME)-$(VERSION)-$(shell git rev-parse HEAD | cut -b 1-8).tar.gz