AMBARI-26100: Fix all python script file to python3 #3799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

JiaLiangC merged 6 commits into apache:trunk from zRains:fix-py-script

Aug 5, 2024

ambari-agent/conf/unix/agent-multiplier.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     # Licensed to the Apache Software Foundation (ASF) under one or more
     # contributor license agreements.  See the NOTICE file distributed with
     # this work for additional information regarding copyright ownership.
@@ Expand Down @@

ambari-agent/conf/unix/upgrade_agent_configs.py

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    #!/usr/bin/ambari-python-wrap
+    #!/usr/bin/env ambari-python-wrap
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down Expand Up / @@ -56,4 +56,4 @@ @@
       else:
         print("Values are not updated, configs {0} is not found".format(CONFIG_FILE))
     else:
-      print("Values are not updated, backup {0} is not found".format(CONFIG_FILE_BACKUP))
+      print("Values are not updated, backup {0} is not found".format(CONFIG_FILE_BACKUP))

ambari-agent/conf/windows/service_wrapper.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/ActionQueue.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/AgentException.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/BackgroundCommandExecutionHandle.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/ClusterCache.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/CommandHooksOrchestrator.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/ComponentVersionReporter.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/ExitHelper.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/Facter.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env ambari-python-wrap
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/Grep.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     # Licensed to the Apache Software Foundation (ASF) under one or more
     # contributor license agreements.  See the NOTICE file distributed with
     # this work for additional information regarding copyright ownership.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/HostStatusReporter.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/NetUtil.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     # Licensed to the Apache Software Foundation (ASF) under one or more
     # contributor license agreements.  See the NOTICE file distributed with
     # this work for additional information regarding copyright ownership.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/RecoveryManager.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     # Licensed to the Apache Software Foundation (ASF) under one or more
     # contributor license agreements.  See the NOTICE file distributed with
     # this work for additional information regarding copyright ownership.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/RemoteDebugUtils.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/StaleAlertsMonitor.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     # Licensed to the Apache Software Foundation (ASF) under one or more
     # contributor license agreements.  See the NOTICE file distributed with
     # this work for additional information regarding copyright ownership.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/Utils.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/alerts/__init__.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/alerts/collector.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down Expand Up / @@ -91,7 +90,4 @@ def alerts(self): @@
           self.__buckets.clear()
           return alerts
         finally:
-          self.__lock.release()
+          self.__lock.release()

ambari-agent/src/main/python/ambari_agent/apscheduler/__init__.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     version_info = (2, 1, 2)
     version = '.'.join(str(n) for n in version_info[:3])
     release = '.'.join(str(n) for n in version_info)

ambari-agent/src/main/python/ambari_agent/apscheduler/events.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     __all__ = ('EVENT_SCHEDULER_START', 'EVENT_SCHEDULER_SHUTDOWN',
                'EVENT_JOBSTORE_ADDED', 'EVENT_JOBSTORE_REMOVED',
                'EVENT_JOBSTORE_JOB_ADDED', 'EVENT_JOBSTORE_JOB_REMOVED',
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/job.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Jobs represent scheduled tasks.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/__init__.py

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#!/usr/bin/env python3

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/base.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Abstract base class that provides the interface needed by all job stores.
     Job store methods are also documented here.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/mongodb_store.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Stores jobs in a MongoDB database.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/ram_store.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Stores jobs in an array in RAM. Provides no persistence support.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/redis_store.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Stores jobs in a Redis database.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/shelve_store.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Stores jobs in a file governed by the :mod:`shelve` module.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/jobstores/sqlalchemy_store.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Stores jobs in a database table using SQLAlchemy.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/scheduler.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     This module is the main part of the library. It houses the Scheduler class
     and related exceptions.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/threadpool.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Generic thread pool class. Modeled after Java's ThreadPoolExecutor.
     Please note that this ThreadPool does *not* fully implement the PEP 3148
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/__init__.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     from apscheduler.triggers.cron import CronTrigger
     from apscheduler.triggers.interval import IntervalTrigger
     from apscheduler.triggers.simple import SimpleTrigger

ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/cron/__init__.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     from datetime import date, datetime
     from apscheduler.triggers.cron.fields import *
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/cron/expressions.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     This module contains the expressions applicable for CronTrigger's fields.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/cron/fields.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Fields represent CronTrigger options which map to :class:`~datetime.datetime`
     fields.
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/interval.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     from datetime import datetime, timedelta
     from math import ceil
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/apscheduler/triggers/simple.py

Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		#!/usr/bin/env python3
		from apscheduler.util import convert_to_datetime


Expand Down

ambari-agent/src/main/python/ambari_agent/apscheduler/util.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     This module contains several handy functions primarily meant for internal use.
     """
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/debug.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down Expand Up / @@ -47,5 +46,4 @@ def main(): @@
       debug_process(pid)
     if __name__=='__main__':
-      main()
+      main()

ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/listeners/ConfigurationEventListener.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/listeners/HostLevelParamsEventListener.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/listeners/MetadataEventListener.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/listeners/TopologyEventListener.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/models/__init__.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/models/commands.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/ambari_agent/models/hooks.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/main/python/setup.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     # Licensed to the Apache Software Foundation (ASF) under one or more
     # contributor license agreements.  See the NOTICE file distributed with
     # this work for additional information regarding copyright ownership.
@@ Expand Down @@

ambari-agent/src/test/python/ambari_agent/BaseStompServerTestCase.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/ambari_agent/TestCommandHooksOrchestrator.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     """
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/ambari_agent/TestKerberosCommon.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/ambari_agent/TestMain.py

-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestContentSources.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestDataStructureUtils.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestDatanodeHelper.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestDirectoryResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestEncryption.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestExecuteHadoopResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestExecuteResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestFcntlBasedProcessLock.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestFileResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestFileSystem.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestGetPathFromUrl.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestGroupResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestLibraryFunctions.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestLinkResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestMonitorWebserverResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestPackageResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

ambari-agent/src/test/python/resource_management/TestRepositoryResource.py

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    #!/usr/bin/env python3
     '''
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AMBARI-26100: Fix all python script file to python3 #3799

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!