From 6277f72c078a20b05cf5e23cd4baeb3a1e9b1f82 Mon Sep 17 00:00:00 2001 From: Sorin Date: Tue, 7 Jan 2014 12:59:36 +0200 Subject: [PATCH] add try catch for missing package in old boto versions --- tests/test_dynamodb2/test_dynamodb.py | 6 ++++-- .../test_dynamodb_table_with_range_key.py | 19 +++++++++++-------- .../test_dynamodb_table_without_range_key.py | 13 ++++++++----- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/tests/test_dynamodb2/test_dynamodb.py b/tests/test_dynamodb2/test_dynamodb.py index 4729a9c2..faf59ce3 100644 --- a/tests/test_dynamodb2/test_dynamodb.py +++ b/tests/test_dynamodb2/test_dynamodb.py @@ -1,12 +1,14 @@ import boto import sure # noqa import requests -import boto.dynamodb2 from moto import mock_dynamodb2 from moto.dynamodb2 import dynamodb_backend2 from boto.exception import JSONResponseError from tests.helpers import requires_boto_gte - +try: + import boto.dynamodb2 +except ImportError: + print "This boto version is not supported" @requires_boto_gte("2.9") @mock_dynamodb2 diff --git a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py index ed7e409f..b879600f 100644 --- a/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py +++ b/tests/test_dynamodb2/test_dynamodb_table_with_range_key.py @@ -2,16 +2,19 @@ import boto import sure # noqa from freezegun import freeze_time from moto import mock_dynamodb2 -from boto.dynamodb2.fields import HashKey -from boto.dynamodb2.fields import RangeKey -from boto.dynamodb2.table import Table -from boto.dynamodb2.table import Item -from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError -from boto.dynamodb2.exceptions import ValidationException -from boto.dynamodb2.exceptions import ConditionalCheckFailedException from boto.exception import JSONResponseError from tests.helpers import requires_boto_gte - +try: + from boto.dynamodb2.fields import HashKey + from boto.dynamodb2.fields import RangeKey + from boto.dynamodb2.table import Table + from boto.dynamodb2.table import Item + from boto.dynamodb.exceptions import DynamoDBKeyNotFoundError + from boto.dynamodb2.exceptions import ValidationException + from boto.dynamodb2.exceptions import ConditionalCheckFailedException +except ImportError: + print "This boto version is not supported" + def create_table(): table = Table.create('messages', schema=[ HashKey('forum_name'), diff --git a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py index c6055fe2..fe2f2549 100644 --- a/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py +++ b/tests/test_dynamodb2/test_dynamodb_table_without_range_key.py @@ -3,12 +3,15 @@ import sure # noqa from freezegun import freeze_time from boto.exception import JSONResponseError from moto import mock_dynamodb2 -from boto.dynamodb2.fields import HashKey -from boto.dynamodb2.fields import RangeKey -from boto.dynamodb2.table import Table -from boto.dynamodb2.table import Item from tests.helpers import requires_boto_gte - +try: + from boto.dynamodb2.fields import HashKey + from boto.dynamodb2.fields import RangeKey + from boto.dynamodb2.table import Table + from boto.dynamodb2.table import Item +except ImportError: + print "This boto version is not supported" + def create_table(): table = Table.create('messages', schema=[ HashKey('forum_name')