core: finished removal of pyro4.

backend is no longer available to be used. We rely purely on http implementation.

configs/development_http.ini

@@ -32,7 +32,7 b' use = egg:waitress#main'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, pyro4, beaker
+keys = root, vcsserver, beaker
 
 [handlers]
 keys = console
@@ -59,12 +59,6 b' handlers ='
 qualname = beaker
 propagate = 1
 
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
 
 ##############
 ## HANDLERS ##

configs/production_http.ini

@@ -56,7 +56,7 b' beaker.cache.repo_object.enabled = true'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, pyro4, beaker
+keys = root, vcsserver, beaker
 
 [handlers]
 keys = console
@@ -83,12 +83,6 b' handlers ='
 qualname = beaker
 propagate = 1
 
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
 
 ##############
 ## HANDLERS ##

pkgs/python-packages.nix

@@ -67,19 +67,6 b''
       license = [ pkgs.lib.licenses.mit ];
     };
   };
-  Pyro4 = super.buildPythonPackage {
-    name = "Pyro4-4.41";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [serpent];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/56/2b/89b566b4bf3e7f8ba790db2d1223852f8cb454c52cab7693dd41f608ca2a/Pyro4-4.41.tar.gz";
-      md5 = "ed69e9bfafa9c06c049a87cb0c4c2b6c";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   WebOb = super.buildPythonPackage {
     name = "WebOb-1.3.1";
     buildInputs = with self; [];
@@ -591,25 +578,12 b''
     name = "rhodecode-vcsserver-4.8.0";
     buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj];
     doCheck = true;
-    propagatedBuildInputs = with self; [Beaker configobj decorator dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid pyramid-jinja2 pyramid-mako repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface ipdb ipython gevent greenlet gunicorn waitress Pyro4 serpent pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
+    propagatedBuildInputs = with self; [Beaker configobj decorator dulwich hgsubversion infrae.cache mercurial msgpack-python pyramid pyramid-jinja2 pyramid-mako repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface ipdb ipython gevent greenlet gunicorn waitress pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage];
     src = ./.;
     meta = {
       license = [ { fullName = "GPL V3"; } { fullName = "GNU General Public License v3 or later (GPLv3+)"; } ];
     };
   };
-  serpent = super.buildPythonPackage {
-    name = "serpent-1.15";
-    buildInputs = with self; [];
-    doCheck = false;
-    propagatedBuildInputs = with self; [];
-    src = fetchurl {
-      url = "https://pypi.python.org/packages/7b/38/b2b27673a882ff2ea5871bb3e3e6b496ebbaafd1612e51990ffb158b9254/serpent-1.15.tar.gz";
-      md5 = "e27b1aad5c218e16442f52abb7c7053a";
-    };
-    meta = {
-      license = [ pkgs.lib.licenses.mit ];
-    };
-  };
   setuptools = super.buildPythonPackage {
     name = "setuptools-30.1.0";
     buildInputs = with self; [];

requirements.txt

@@ -35,9 +35,5 b' greenlet==0.4.10'
 gunicorn==19.6.0
 waitress==1.0.1
 
-# Pyro/Deprecated TODO(Marcink): remove in 4.7 release.
-Pyro4==4.41
-serpent==1.15
-
 ## test related requirements
 -r requirements_test.txt

test.ini

@@ -26,7 +26,7 b' beaker.cache.repo_object.enabled = true'
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, pyro4, beaker
+keys = root, vcsserver, beaker
 
 [handlers]
 keys = console
@@ -53,12 +53,6 b' handlers ='
 qualname = beaker
 propagate = 1
 
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
 
 ##############
 ## HANDLERS ##

vcsserver/hg.py

@@ -298,7 +298,7 b' class HgRemote(object):'
         ctx = repo[revision]
         status = repo[ctx.p1().node()].status(other=ctx.node())
         # object of status (odd, custom named tuple in mercurial) is not
-        # correctly serializable via Pyro, we make it a list, as the underling
+        # correctly serializable, we make it a list, as the underling
         # API expects this to be a list
         return list(status)
 

vcsserver/hooks.py

@@ -30,7 +30,6 b' from httplib import HTTPConnection'
 
 import mercurial.scmutil
 import mercurial.node
-import Pyro4
 import simplejson as json
 
 from vcsserver import exceptions
@@ -68,15 +67,6 b' class HooksDummyClient(object):'
             return getattr(hooks, hook_name)(extras)
 
 
-class HooksPyro4Client(object):
-    def __init__(self, hooks_uri):
-        self.hooks_uri = hooks_uri
-
-    def __call__(self, hook_name, extras):
-        with Pyro4.Proxy(self.hooks_uri) as hooks:
-            return getattr(hooks, hook_name)(extras)
-
-
 class RemoteMessageWriter(object):
     """Writer base class."""
     def write(message):
@@ -126,11 +116,7 b' def _handle_exception(result):'
 def _get_hooks_client(extras):
     if 'hooks_uri' in extras:
         protocol = extras.get('hooks_protocol')
-        return (
-            HooksHttpClient(extras['hooks_uri'])
-            if protocol == 'http'
-            else HooksPyro4Client(extras['hooks_uri'])
-        )
+        return HooksHttpClient(extras['hooks_uri'])
     else:
         return HooksDummyClient(extras['hooks_module'])
 

vcsserver/settings.py

@@ -15,16 +15,5 b''
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
-
-PYRO_PORT = 9900
-
-PYRO_GIT = 'git_remote'
-PYRO_HG = 'hg_remote'
-PYRO_SVN = 'svn_remote'
-PYRO_VCSSERVER = 'vcs_server'
-PYRO_GIT_REMOTE_WSGI = 'git_remote_wsgi'
-PYRO_HG_REMOTE_WSGI = 'hg_remote_wsgi'
-
 WIRE_ENCODING = 'UTF-8'
-
 GIT_EXECUTABLE = 'git'

vcsserver/tests/test_hooks.py

@@ -29,46 +29,6 b' import simplejson as json'
 from vcsserver import hooks
 
 
-class HooksStub(object):
-    """
-    Simulates a Proy4.Proxy object.
-
-    Will always return `result`, no matter which hook has been called on it.
-    """
-
-    def __init__(self, result):
-        self._result = result
-
-    def __call__(self, hooks_uri):
-        return self
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        pass
-
-    def __getattr__(self, name):
-        return mock.Mock(return_value=self._result)
-
-
[e-mail]
-def mock_hook_response(
-        status=0, output='', exception=None, exception_args=None):
-    response = {
-        'status': status,
-        'output': output,
-    }
-    if exception:
-        response.update({
-            'exception': exception,
-            'exception_args': exception_args,
-        })
-
-    with mock.patch('Pyro4.Proxy', HooksStub(response)):
-        yield
-
-
 def get_hg_ui(extras=None):
     """Create a Config object with a valid RC_SCM_DATA entry."""
     extras = extras or {}
@@ -89,126 +49,6 b' def get_hg_ui(extras=None):'
     return hg_ui
 
 
-def test_call_hook_no_error(capsys):
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-    writer = mock.Mock()
-
-    with mock_hook_response(status=1, output=expected_output):
-        hooks._call_hook('hook_name', extras, writer)
-
-    out, err = capsys.readouterr()
-
-    writer.write.assert_called_with(expected_output)
-    assert err == ''
-
-
-def test_call_hook_with_exception(capsys):
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-    writer = mock.Mock()
-
-    with mock_hook_response(status=1, output=expected_output,
-                            exception='TypeError',
-                            exception_args=('Mock exception', )):
-        with pytest.raises(Exception) as excinfo:
-            hooks._call_hook('hook_name', extras, writer)
-
-    assert excinfo.type == Exception
-    assert 'Mock exception' in str(excinfo.value)
-
-    out, err = capsys.readouterr()
-
-    writer.write.assert_called_with(expected_output)
-    assert err == ''
-
-
-def test_call_hook_with_locked_exception(capsys):
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-    writer = mock.Mock()
-
-    with mock_hook_response(status=1, output=expected_output,
-                            exception='HTTPLockedRC',
-                            exception_args=('message',)):
-        with pytest.raises(Exception) as excinfo:
-            hooks._call_hook('hook_name', extras, writer)
-
-    assert excinfo.value._vcs_kind == 'repo_locked'
-    assert 'message' == str(excinfo.value)
-
-    out, err = capsys.readouterr()
-
-    writer.write.assert_called_with(expected_output)
-    assert err == ''
-
-
-def test_call_hook_with_stdout():
-    extras = {
-        'hooks_uri': 'fake_hook_uri',
-    }
-    expected_output = 'My mock outptut'
-
-    stdout = io.BytesIO()
-    with mock_hook_response(status=1, output=expected_output):
-        hooks._call_hook('hook_name', extras, stdout)
-
-    assert stdout.getvalue() == expected_output
-
-
-def test_repo_size():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.repo_size(hg_ui, None) == 1
-
-
-def test_pre_pull():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.pre_pull(hg_ui, None) == 1
-
-
-def test_post_pull():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.post_pull(hg_ui, None) == 1
-
-
-def test_pre_push():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        assert hooks.pre_push(hg_ui, None) == 1
-
-
-def test_post_push():
-    hg_ui = get_hg_ui()
-
-    with mock_hook_response(status=1):
-        with mock.patch('vcsserver.hooks._rev_range_hash', return_value=[]):
-            assert hooks.post_push(hg_ui, None, None) == 1
-
-
-def test_git_pre_receive():
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=1):
-        response = hooks.git_pre_receive(None, None,
-                                         {'RC_SCM_DATA': json.dumps(extras)})
-        assert response == 1
-
-
 def test_git_pre_receive_is_disabled():
     extras = {'hooks': ['pull']}
     response = hooks.git_pre_receive(None, None,
@@ -217,18 +57,6 b' def test_git_pre_receive_is_disabled():'
     assert response == 0
 
 
-def test_git_post_receive_no_subprocess_call():
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    # Setting revision_lines to '' avoid all subprocess_calls
-    with mock_hook_response(status=1):
-        response = hooks.git_post_receive(None, '',
-                                          {'RC_SCM_DATA': json.dumps(extras)})
-        assert response == 1
-
-
 def test_git_post_receive_is_disabled():
     extras = {'hooks': ['pull']}
     response = hooks.git_post_receive(None, '',
@@ -279,122 +107,16 b' def test_repo_size_exception_does_not_af'
     assert result == status
 
 
[e-mail]('vcsserver.hooks._run_command')
-def test_git_post_receive_first_commit_sub_branch(cmd_mock):
-    def cmd_mock_returns(args):
-        if args == ['git', 'show', 'HEAD']:
-            raise
-        if args == ['git', 'for-each-ref', '--format=%(refname)',
-                    'refs/heads/*']:
-            return 'refs/heads/test-branch2/sub-branch'
-        if args == ['git', 'log', '--reverse', '--pretty=format:%H', '--',
-                    '9695eef57205c17566a3ae543be187759b310bb7', '--not',
-                    'refs/heads/test-branch2/sub-branch']:
-            return ''
-
-    cmd_mock.side_effect = cmd_mock_returns
-
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri'
-    }
-    rev_lines = ['0000000000000000000000000000000000000000 '
-                 '9695eef57205c17566a3ae543be187759b310bb7 '
-                 'refs/heads/feature/sub-branch\n']
-    with mock_hook_response(status=0):
-        response = hooks.git_post_receive(None, rev_lines,
-                                          {'RC_SCM_DATA': json.dumps(extras)})
-
-    calls = [
-        mock.call(['git', 'show', 'HEAD']),
-        mock.call(['git', 'symbolic-ref', 'HEAD',
-                   'refs/heads/feature/sub-branch']),
-    ]
-    cmd_mock.assert_has_calls(calls, any_order=True)
-    assert response == 0
-
-
[e-mail]('vcsserver.hooks._run_command')
-def test_git_post_receive_first_commit_revs(cmd_mock):
-    extras = {
-        'hooks': ['push'],
-        'hooks_uri': 'fake_hook_uri'
-    }
-    rev_lines = [
-        '0000000000000000000000000000000000000000 '
-        '9695eef57205c17566a3ae543be187759b310bb7 refs/heads/master\n']
-    with mock_hook_response(status=0):
-        response = hooks.git_post_receive(
-            None, rev_lines, {'RC_SCM_DATA': json.dumps(extras)})
-
-    calls = [
-        mock.call(['git', 'show', 'HEAD']),
-        mock.call(['git', 'for-each-ref', '--format=%(refname)',
-                   'refs/heads/*']),
-        mock.call(['git', 'log', '--reverse', '--pretty=format:%H',
-                   '--', '9695eef57205c17566a3ae543be187759b310bb7', '--not',
-                   ''])
-    ]
-    cmd_mock.assert_has_calls(calls, any_order=True)
-
-    assert response == 0
-
-
-def test_git_pre_pull():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=1, output='foo'):
-        assert hooks.git_pre_pull(extras) == hooks.HookResponse(1, 'foo')
-
-
-def test_git_pre_pull_exception_is_caught():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=2, exception=Exception('foo')):
-        assert hooks.git_pre_pull(extras).status == 128
-
-
 def test_git_pre_pull_is_disabled():
     assert hooks.git_pre_pull({'hooks': ['push']}) == hooks.HookResponse(0, '')
 
 
-def test_git_post_pull():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=1, output='foo'):
-        assert hooks.git_post_pull(extras) == hooks.HookResponse(1, 'foo')
-
-
-def test_git_post_pull_exception_is_caught():
-    extras = {
-        'hooks': ['pull'],
-        'hooks_uri': 'fake_hook_uri',
-    }
-    with mock_hook_response(status=2, exception='Exception',
-                            exception_args=('foo',)):
-        assert hooks.git_post_pull(extras).status == 128
-
-
 def test_git_post_pull_is_disabled():
     assert (
         hooks.git_post_pull({'hooks': ['push']}) == hooks.HookResponse(0, ''))
 
 
 class TestGetHooksClient(object):
-    def test_returns_pyro_client_when_protocol_matches(self):
-        hooks_uri = 'localhost:8000'
-        result = hooks._get_hooks_client({
-            'hooks_uri': hooks_uri,
-            'hooks_protocol': 'pyro4'
-        })
-        assert isinstance(result, hooks.HooksPyro4Client)
-        assert result.hooks_uri == hooks_uri
 
     def test_returns_http_client_when_protocol_matches(self):
         hooks_uri = 'localhost:8000'
@@ -405,14 +127,6 b' class TestGetHooksClient(object):'
         assert isinstance(result, hooks.HooksHttpClient)
         assert result.hooks_uri == hooks_uri
 
-    def test_returns_pyro4_client_when_no_protocol_is_specified(self):
-        hooks_uri = 'localhost:8000'
-        result = hooks._get_hooks_client({
-            'hooks_uri': hooks_uri
-        })
-        assert isinstance(result, hooks.HooksPyro4Client)
-        assert result.hooks_uri == hooks_uri
-
     def test_returns_dummy_client_when_hooks_uri_not_specified(self):
         fake_module = mock.Mock()
         import_patcher = mock.patch.object(
@@ -487,30 +201,6 b' class TestHooksDummyClient(object):'
         assert result == hooks_module.Hooks().__enter__().post_push()
 
 
-class TestHooksPyro4Client(object):
-    def test_init_sets_hooks_uri(self):
-        uri = 'localhost:3000'
-        client = hooks.HooksPyro4Client(uri)
-        assert client.hooks_uri == uri
-
-    def test_call_returns_hook_value(self):
-        hooks_uri = 'localhost:3000'
-        client = hooks.HooksPyro4Client(hooks_uri)
-        hooks_module = mock.Mock()
-        context_manager = mock.MagicMock()
-        context_manager.__enter__.return_value = hooks_module
-        pyro4_patcher = mock.patch.object(
-            hooks.Pyro4, 'Proxy', return_value=context_manager)
-        extras = {
-            'test': 'test'
-        }
-        with pyro4_patcher as pyro4_mock:
-            result = client('post_push', extras)
-        pyro4_mock.assert_called_once_with(hooks_uri)
-        hooks_module.post_push.assert_called_once_with(extras)
-        assert result == hooks_module.post_push.return_value
-
-
 @pytest.fixture
 def http_mirror(request):
     server = MirrorHttpServer()

vcsserver/tests/test_main_http.py

@@ -18,24 +18,24 b''
 import mock
 import pytest
 
-from vcsserver import main
+from vcsserver import http_main
 from vcsserver.base import obfuscate_qs
 
 
[e-mail]('vcsserver.main.VcsServerCommand', mock.Mock())
[e-mail]('vcsserver.http_main.VCS', mock.Mock())
 @mock.patch('vcsserver.hgpatches.patch_largefiles_capabilities')
 def test_applies_largefiles_patch(patch_largefiles_capabilities):
-    main.main([])
+    http_main.main([])
     patch_largefiles_capabilities.assert_called_once_with()
 
 
[e-mail]('vcsserver.main.VcsServerCommand', mock.Mock())
[e-mail]('vcsserver.main.MercurialFactory', None)
[e-mail]('vcsserver.http_main.VCS', mock.Mock())
[e-mail]('vcsserver.http_main.MercurialFactory', None)
 @mock.patch(
     'vcsserver.hgpatches.patch_largefiles_capabilities',
     mock.Mock(side_effect=Exception("Must not be called")))
 def test_applies_largefiles_patch_only_if_mercurial_is_available():
-    main.main([])
+    http_main.main([])
 
 
 @pytest.mark.parametrize('given, expected', [