Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop import fallback for Python 2

Browse Source 
cPickle no longer exists in Python 3 and pickle should be used always.

Change-Id: I5ddedb3e996d9a0679bab38ea94263886274ece4
This commit is contained in:
Takashi Kajinami
2025-02-09 08:04:36 +09:00
parent 961bbb9460
commit 6b81b34b27
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/db/sqlalchemy/job_store.py
View File

@@ -16,23 +16,19 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from oslo_serialization import jsonutils import pickle
from apscheduler.jobstores.base import ConflictingIdError from apscheduler.jobstores.base import ConflictingIdError
from apscheduler.jobstores import sqlalchemy from apscheduler.jobstores import sqlalchemy
from apscheduler.util import datetime_to_utc_timestamp from apscheduler.util import datetime_to_utc_timestamp
from apscheduler.util import maybe_ref from apscheduler.util import maybe_ref
from apscheduler.util import utc_timestamp_to_datetime from apscheduler.util import utc_timestamp_to_datetime
from oslo_serialization import jsonutils
from watcher.common import context from watcher.common import context
from watcher.common import service from watcher.common import service
from watcher import objects from watcher import objects
try:
import cPickle as pickle
except ImportError: # pragma: nocover
import pickle
from sqlalchemy import Table, MetaData, select, and_, null from sqlalchemy import Table, MetaData, select, and_, null
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError