From 2009b912d3cb166c184967513187501327e216b2 Mon Sep 17 00:00:00 2001
From: idziubenko <id@mail.spb.calculate.ru>
Date: Mon, 9 Aug 2021 12:17:29 +0300
Subject: [PATCH] deleted unneeded py2 script

---
 bin/cl-core_py2               | 21 ---------------------
 bin/cl-core_py3               | 21 ---------------------
 pym/core/server/cl_server.py  |  2 +-
 pym/core/server/gen_pid.py    |  1 -
 pym/core/server/local_call.py |  2 +-
 setup.py                      |  1 -
 6 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 bin/cl-core_py2
 delete mode 100644 bin/cl-core_py3

diff --git a/bin/cl-core_py2 b/bin/cl-core_py2
deleted file mode 100644
index f5bc9d7..0000000
--- a/bin/cl-core_py2
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-
-# Copyright 2012-2016 Mir Calculate. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-import calculate.core.core_main as core_main
-
-if __name__ == '__main__':
-    core_main.core_main()
diff --git a/bin/cl-core_py3 b/bin/cl-core_py3
deleted file mode 100644
index 070c337..0000000
--- a/bin/cl-core_py3
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# Copyright 2012-2016 Mir Calculate. http://www.calculate-linux.org
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-import calculate.core.core_main as core_main
-
-if __name__ == '__main__':
-    core_main.core_main()
diff --git a/pym/core/server/cl_server.py b/pym/core/server/cl_server.py
index e22dd3f..9b1e88b 100644
--- a/pym/core/server/cl_server.py
+++ b/pym/core/server/cl_server.py
@@ -45,7 +45,7 @@ _('No module named %s')
 def main(*args, **keywords):
     _args = list(unpack_single_opts(sys.argv[1:]))
     caller = os.path.basename(sys.argv[0]) 
-    if not (caller == 'cl-core' or caller == 'cl-core_py3'):
+    if not (caller == 'cl-core'):
         parser = cert_cmd.parse(full=False)
         args, unknown_args = parser.parse_known_args(_args)
         args.method = '_temp_'
diff --git a/pym/core/server/gen_pid.py b/pym/core/server/gen_pid.py
index 83a1dff..5b6443b 100644
--- a/pym/core/server/gen_pid.py
+++ b/pym/core/server/gen_pid.py
@@ -50,7 +50,6 @@ def get_symlink_commands():
     for line in readLinesFile(symlinks):
         yield line.strip()
     yield "/usr/bin/cl-core"
-    yield "/usr/bin/cl-core_py3"
     yield "/usr/bin/cl-update"
     yield "/usr/bin/cl-core-patch"
 
diff --git a/pym/core/server/local_call.py b/pym/core/server/local_call.py
index c4d79de..1d0821d 100644
--- a/pym/core/server/local_call.py
+++ b/pym/core/server/local_call.py
@@ -188,7 +188,7 @@ def local_method(metaObject, args, unknown_args):
 
     sym_link = os.path.basename(sys.argv[0])
     # sym_link = "cl-core"
-    if not (sym_link == 'cl-core' or  sym_link == 'cl-core_py3'):
+    if not (sym_link == 'cl-core'):
         if sym_link in LoadedMethods.conMethods.keys():
             args.method = LoadedMethods.conMethods[sym_link][0]
         else:
diff --git a/setup.py b/setup.py
index a0d4a34..450027d 100755
--- a/setup.py
+++ b/setup.py
@@ -113,7 +113,6 @@ setup(
     license = "http://www.apache.org/licenses/LICENSE-2.0",
     data_files = (
         ('/usr/sbin', [('bin/cl-core',0o755)]),
-        ('/usr/sbin', [('bin/cl-core_py2',0o755)]),
         ('/etc/init.d', [('data/calculate-core',0o755)]),
         ('/usr/share/man/man1',glob('man/cl-*')),
         ('/usr/share/man/ru/man1',glob('man/ru/*')),