Skip to content

Commit c04c60f

Browse files
emptyempty
committed
Removed method_missing since it was only used in one place.
1 parent 564db4f commit c04c60f

File tree

11 files changed

+49
-75
lines changed

11 files changed

+49
-75
lines changed

‎README‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ Tom Preston-Werner and Chris Wanstrath.
99

1010
.. _grit: http://grit.rubyforge.org
1111

12-
The idea for the ``method_missing`` stuff was `taken from this blog post`_.
13-
14-
.. _taken from this blog post: http://blog.iffy.us/?p=43
15-
1612
REQUIREMENTS
1713
============
1814

‎doc/tutorial.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ What Else?
184184

185185
There is more stuff in there, like the ability to tar or gzip repos, stats,
186186
log, blame, and probably a few other things. Additionally calls to the git
187-
instance are handled through a ``method_missing`` construct, which makes
187+
instance are handled through a ``__getattr__`` construct, which makes
188188
available any git commands directly, with a nice conversion of Python dicts
189189
to command line parameters.
190190

‎lib/git/cmd.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import subprocess
99
import re
1010
from utils import *
11-
from method_missing import MethodMissingMixin
1211
from errors import GitCommandError
1312

1413
# Enables debugging of GitPython's git commands
@@ -17,14 +16,19 @@
1716
execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output',
1817
'with_exceptions', 'with_raw_output')
1918

20-
class Git(MethodMissingMixin):
19+
class Git(object):
2120
"""
2221
The Git class manages communication with the Git binary
2322
"""
2423
def __init__(self, git_dir):
2524
super(Git, self).__init__()
2625
self.git_dir = git_dir
2726

27+
def __getattr__(self, name):
28+
if name[:1] == '_':
29+
raise AttributeError(name)
30+
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
31+
2832
@property
2933
def get_dir(self):
3034
return self.git_dir
@@ -131,7 +135,7 @@ def transform_kwargs(self, **kwargs):
131135
args.append("--%s=%s" % (dashify(k), v))
132136
return args
133137

134-
def method_missing(self, method, *args, **kwargs):
138+
def _call_process(self, method, *args, **kwargs):
135139
"""
136140
Run the given git command with the specified arguments and return
137141
the result as a String

‎lib/git/method_missing.py‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎test/git/test_blob.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ class TestBlob(object):
1212
def setup(self):
1313
self.repo = Repo(GIT_REPO)
1414

15-
@patch(Git, 'method_missing')
15+
@patch(Git, '_call_process')
1616
def test_should_return_blob_contents(self, git):
1717
git.return_value = fixture('cat_file_blob')
1818
blob = Blob(self.repo, **{'id': 'abc'})
1919
assert_equal("Hello world", blob.data)
2020
assert_true(git.called)
2121
assert_equal(git.call_args, (('cat_file', 'abc'), {'p': True}))
2222

23-
@patch(Git, 'method_missing')
23+
@patch(Git, '_call_process')
2424
def test_should_cache_data(self, git):
2525
git.return_value = fixture('cat_file_blob')
2626
blob = Blob(self.repo, **{'id': 'abc'})
@@ -30,15 +30,15 @@ def test_should_cache_data(self, git):
3030
assert_equal(git.call_count, 1)
3131
assert_equal(git.call_args, (('cat_file', 'abc'), {'p': True}))
3232

33-
@patch(Git, 'method_missing')
33+
@patch(Git, '_call_process')
3434
def test_should_return_file_size(self, git):
3535
git.return_value = fixture('cat_file_blob_size')
3636
blob = Blob(self.repo, **{'id': 'abc'})
3737
assert_equal(11, blob.size)
3838
assert_true(git.called)
3939
assert_equal(git.call_args, (('cat_file', 'abc'), {'s': True}))
4040

41-
@patch(Git, 'method_missing')
41+
@patch(Git, '_call_process')
4242
def test_should_cache_file_size(self, git):
4343
git.return_value = fixture('cat_file_blob_size')
4444
blob = Blob(self.repo, **{'id': 'abc'})
@@ -56,7 +56,7 @@ def test_mime_type_should_return_text_plain_for_unknown_types(self):
5656
blob = Blob(self.repo, **{'id': 'abc'})
5757
assert_equal("text/plain", blob.mime_type)
5858

59-
@patch(Git, 'method_missing')
59+
@patch(Git, '_call_process')
6060
def test_should_display_blame_information(self, git):
6161
git.return_value = fixture('blame')
6262
b = Blob.blame(self.repo, 'master', 'lib/git.py')

‎test/git/test_commit.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TestCommit(object):
1111
def setup(self):
1212
self.repo = Repo(GIT_REPO)
1313

14-
@patch(Git, 'method_missing')
14+
@patch(Git, '_call_process')
1515
def test_bake(self, git):
1616
git.return_value = fixture('rev_list_single')
1717

@@ -24,12 +24,12 @@ def test_bake(self, git):
2424
assert_true(git.called)
2525
assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
2626

27-
@patch(Git, 'method_missing')
27+
@patch(Git, '_call_process')
2828
def test_id_abbrev(self, git):
2929
git.return_value = fixture('rev_list_commit_idabbrev')
3030
assert_equal('80f136f', self.repo.commit('80f136f500dfdb8c3e8abf4ae716f875f0a1b57f').id_abbrev)
3131

32-
@patch(Git, 'method_missing')
32+
@patch(Git, '_call_process')
3333
def test_diff(self, git):
3434
git.return_value = fixture('diff_p')
3535

@@ -54,7 +54,7 @@ def test_diff(self, git):
5454
assert_true(git.called)
5555
assert_equal(git.call_args, (('diff', 'master'), {'full_index': True}))
5656

57-
@patch(Git, 'method_missing')
57+
@patch(Git, '_call_process')
5858
def test_diff_with_two_commits(self, git):
5959
git.return_value = fixture('diff_2')
6060

@@ -65,7 +65,7 @@ def test_diff_with_two_commits(self, git):
6565
assert_true(git.called)
6666
assert_equal(git.call_args, (('diff', '59ddc32', '13d27d5'), {'full_index': True}))
6767

68-
@patch(Git, 'method_missing')
68+
@patch(Git, '_call_process')
6969
def test_diff_with_files(self, git):
7070
git.return_value = fixture('diff_f')
7171

@@ -77,7 +77,7 @@ def test_diff_with_files(self, git):
7777
assert_true(git.called)
7878
assert_equal(git.call_args, (('diff', '59ddc32', '--', 'lib'), {'full_index': True}))
7979

80-
@patch(Git, 'method_missing')
80+
@patch(Git, '_call_process')
8181
def test_diff_with_two_commits_and_files(self, git):
8282
git.return_value = fixture('diff_2f')
8383

@@ -89,7 +89,7 @@ def test_diff_with_two_commits_and_files(self, git):
8989
assert_true(git.called)
9090
assert_equal(git.call_args, (('diff', '59ddc32', '13d27d5', '--', 'lib'), {'full_index': True}))
9191

92-
@patch(Git, 'method_missing')
92+
@patch(Git, '_call_process')
9393
def test_diffs(self, git):
9494
git.return_value = fixture('diff_p')
9595

@@ -117,7 +117,7 @@ def test_diffs(self, git):
117117
'91169e1f5fa4de2eaea3f176461f5dc784796769',
118118
), {'full_index': True}))
119119

120-
@patch(Git, 'method_missing')
120+
@patch(Git, '_call_process')
121121
def test_diffs_on_initial_import(self, git):
122122
git.return_value = fixture('diff_i')
123123

@@ -144,7 +144,7 @@ def test_diffs_on_initial_import(self, git):
144144
assert_true(git.called)
145145
assert_equal(git.call_args, (('show', '634396b2f541a9f2d58b00be1a07f0c358b999b3'), {'full_index': True, 'pretty': 'raw'}))
146146

147-
@patch(Git, 'method_missing')
147+
@patch(Git, '_call_process')
148148
def test_diffs_on_initial_import_with_empty_commit(self, git):
149149
git.return_value = fixture('show_empty_commit')
150150

@@ -156,7 +156,7 @@ def test_diffs_on_initial_import_with_empty_commit(self, git):
156156
assert_true(git.called)
157157
assert_equal(git.call_args, (('show', '634396b2f541a9f2d58b00be1a07f0c358b999b3'), {'full_index': True, 'pretty': 'raw'}))
158158

159-
@patch(Git, 'method_missing')
159+
@patch(Git, '_call_process')
160160
def test_diffs_with_mode_only_change(self, git):
161161
git.return_value = fixture('diff_mode_only')
162162

@@ -171,7 +171,7 @@ def test_diffs_with_mode_only_change(self, git):
171171
assert_true(git.called)
172172
assert_equal(git.call_args, (('show', '91169e1f5fa4de2eaea3f176461f5dc784796769'), {'full_index': True, 'pretty': 'raw'}))
173173

174-
@patch(Git, 'method_missing')
174+
@patch(Git, '_call_process')
175175
def test_stats(self, git):
176176
git.return_value = fixture('diff_numstat')
177177

‎test/git/test_git.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ def setup(self):
1414
self.git = Git(base)
1515

1616
@patch(Git, 'execute')
17-
def test_method_missing_calls_execute(self, git):
17+
def test__call_process_calls_execute(self, git):
1818
git.return_value = ''
1919
self.git.version()
2020
assert_true(git.called)
21-
# assert_equal(git.call_args, ((("%s version " % self.git_bin_base),), {}))
21+
assert_equal(git.call_args, ((['git', 'version'],), {}))
2222

2323
@raises(GitCommandError)
2424
def test_it_raises_errors(self):

‎test/git/test_head.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TestHead(object):
1111
def setup(self):
1212
self.repo = Repo(GIT_REPO)
1313

14-
@patch(Git, 'method_missing')
14+
@patch(Git, '_call_process')
1515
def test_repr(self, git):
1616
git.return_value = fixture('for_each_ref')
1717

‎test/git/test_repo.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_heads_should_return_array_of_head_objects(self):
2828
for head in self.repo.heads:
2929
assert_equal(Head, head.__class__)
3030

31-
@patch(Git, 'method_missing')
31+
@patch(Git, '_call_process')
3232
def test_heads_should_populate_head_data(self, git):
3333
git.return_value = fixture('for_each_ref')
3434

@@ -39,7 +39,7 @@ def test_heads_should_populate_head_data(self, git):
3939
assert_true(git.called)
4040
assert_equal(git.call_args, (('for_each_ref', 'refs/heads'), {'sort': 'committerdate', 'format': '%(refname)%00%(objectname)'}))
4141

42-
@patch(Git, 'method_missing')
42+
@patch(Git, '_call_process')
4343
def test_commits(self, git):
4444
git.return_value = fixture('rev_list')
4545

@@ -67,7 +67,7 @@ def test_commits(self, git):
6767
assert_true(git.called)
6868
assert_equal(git.call_args, (('rev_list', 'master'), {'skip': 0, 'pretty': 'raw', 'max_count': 10}))
6969

70-
@patch(Git, 'method_missing')
70+
@patch(Git, '_call_process')
7171
def test_commit_count(self, git):
7272
git.return_value = fixture('rev_list_count')
7373

@@ -76,7 +76,7 @@ def test_commit_count(self, git):
7676
assert_true(git.called)
7777
assert_equal(git.call_args, (('rev_list', 'master'), {}))
7878

79-
@patch(Git, 'method_missing')
79+
@patch(Git, '_call_process')
8080
def test_commit(self, git):
8181
git.return_value = fixture('rev_list_single')
8282

@@ -87,7 +87,7 @@ def test_commit(self, git):
8787
assert_true(git.called)
8888
assert_equal(git.call_args, (('rev_list', '4c8124ffcf4039d292442eeccabdeca5af5c5017'), {'pretty': 'raw', 'max_count': 1}))
8989

90-
@patch(Git, 'method_missing')
90+
@patch(Git, '_call_process')
9191
def test_tree(self, git):
9292
git.return_value = fixture('ls_tree_a')
9393

@@ -99,7 +99,7 @@ def test_tree(self, git):
9999
assert_true(git.called)
100100
assert_equal(git.call_args, (('ls_tree', 'master'), {}))
101101

102-
@patch(Git, 'method_missing')
102+
@patch(Git, '_call_process')
103103
def test_blob(self, git):
104104
git.return_value = fixture('cat_file_blob')
105105

@@ -110,7 +110,7 @@ def test_blob(self, git):
110110
assert_equal(git.call_args, (('cat_file', 'abc'), {'p': True}))
111111

112112
@patch(Repo, '__init__')
113-
@patch(Git, 'method_missing')
113+
@patch(Git, '_call_process')
114114
def test_init_bare(self, repo, git):
115115
git.return_value = True
116116

@@ -122,7 +122,7 @@ def test_init_bare(self, repo, git):
122122
assert_equal(repo.call_args, (('repos/foo/bar.git',), {}))
123123

124124
@patch(Repo, '__init__')
125-
@patch(Git, 'method_missing')
125+
@patch(Git, '_call_process')
126126
def test_init_bare_with_options(self, repo, git):
127127
git.return_value = True
128128

@@ -134,7 +134,7 @@ def test_init_bare_with_options(self, repo, git):
134134
assert_equal(repo.call_args, (('repos/foo/bar.git',), {}))
135135

136136
@patch(Repo, '__init__')
137-
@patch(Git, 'method_missing')
137+
@patch(Git, '_call_process')
138138
def test_fork_bare(self, repo, git):
139139
git.return_value = None
140140

@@ -145,7 +145,7 @@ def test_fork_bare(self, repo, git):
145145
assert_true(repo.called)
146146

147147
@patch(Repo, '__init__')
148-
@patch(Git, 'method_missing')
148+
@patch(Git, '_call_process')
149149
def test_fork_bare_with_options(self, repo, git):
150150
git.return_value = None
151151

@@ -156,7 +156,7 @@ def test_fork_bare_with_options(self, repo, git):
156156
{'bare': True, 'template': '/awesome'}))
157157
assert_true(repo.called)
158158

159-
@patch(Git, 'method_missing')
159+
@patch(Git, '_call_process')
160160
def test_diff(self, git):
161161
self.repo.diff('master^', 'master')
162162

@@ -173,7 +173,7 @@ def test_diff(self, git):
173173
assert_true(git.called)
174174
assert_equal(git.call_args, (('diff', 'master^', 'master', '--', 'foo/bar', 'foo/baz'), {}))
175175

176-
@patch(Git, 'method_missing')
176+
@patch(Git, '_call_process')
177177
def test_diff(self, git):
178178
git.return_value = fixture('diff_p')
179179

@@ -248,7 +248,7 @@ def test_alternates_setter_empty(self, os):
248248
def test_repr(self):
249249
assert_equal('<GitPython.Repo "%s/.git">' % os.path.abspath(GIT_REPO), repr(self.repo))
250250

251-
@patch(Git, 'method_missing')
251+
@patch(Git, '_call_process')
252252
def test_log(self, git):
253253
git.return_value = fixture('rev_list')
254254
assert_equal('4c8124ffcf4039d292442eeccabdeca5af5c5017', self.repo.log()[0].id)
@@ -257,15 +257,15 @@ def test_log(self, git):
257257
assert_equal(git.call_count, 2)
258258
assert_equal(git.call_args, (('log', 'master'), {'pretty': 'raw'}))
259259

260-
@patch(Git, 'method_missing')
260+
@patch(Git, '_call_process')
261261
def test_log_with_path_and_options(self, git):
262262
git.return_value = fixture('rev_list')
263263
self.repo.log('master', 'file.rb', **{'max_count': 1})
264264
assert_true(git.called)
265265
assert_equal(git.call_args, (('log', 'master', '--', 'file.rb'), {'pretty': 'raw', 'max_count': 1}))
266266

267-
# @patch(Git, 'method_missing')
268-
# @patch(Git, 'method_missing')
267+
# @patch(Git, '_call_process')
268+
# @patch(Git, '_call_process')
269269
# def test_commit_deltas_from_nothing_new(self, gitb, gita):
270270
# gitb.return_value = fixture("rev_list_delta_b")
271271
# gita.return_value = fixture("rev_list_delta_a")

0 commit comments

Comments
 (0)