From 5b054bf1604c4cf76ec644f3e3023f1f033d8a85 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Fri, 29 Jan 2016 13:28:26 -0600 Subject: [PATCH] [ci skip] Update copyright dates --- README.rst | 2 +- benchmarks/base.py | 2 +- benchmarks/callback_full_pipeline.py | 2 +- benchmarks/future_batches.py | 2 +- benchmarks/future_full_pipeline.py | 2 +- benchmarks/future_full_throttle.py | 2 +- benchmarks/sync.py | 2 +- build.yaml | 2 +- cassandra/__init__.py | 2 +- cassandra/auth.py | 2 +- cassandra/buffer.pxd | 2 +- cassandra/bytesio.pxd | 2 +- cassandra/bytesio.pyx | 2 +- cassandra/cluster.py | 2 +- cassandra/cmurmur3.c | 2 +- cassandra/concurrent.py | 2 +- cassandra/connection.py | 2 +- cassandra/cqlengine/__init__.py | 2 +- cassandra/cqlengine/columns.py | 2 +- cassandra/cqlengine/connection.py | 2 +- cassandra/cqlengine/functions.py | 2 +- cassandra/cqlengine/management.py | 2 +- cassandra/cqlengine/models.py | 2 +- cassandra/cqlengine/named.py | 2 +- cassandra/cqlengine/operators.py | 2 +- cassandra/cqlengine/query.py | 2 +- cassandra/cqlengine/statements.py | 2 +- cassandra/cqltypes.py | 2 +- cassandra/cython_marshal.pyx | 2 +- cassandra/cython_utils.pxd | 2 +- cassandra/cython_utils.pyx | 2 +- cassandra/deserializers.pxd | 2 +- cassandra/deserializers.pyx | 2 +- cassandra/encoder.py | 2 +- cassandra/io/__init__.py | 2 +- cassandra/io/asyncorereactor.py | 2 +- cassandra/io/eventletreactor.py | 2 +- cassandra/io/geventreactor.py | 2 +- cassandra/io/libevreactor.py | 2 +- cassandra/io/twistedreactor.py | 2 +- cassandra/ioutils.pyx | 2 +- cassandra/marshal.py | 2 +- cassandra/metadata.py | 2 +- cassandra/metrics.py | 2 +- cassandra/numpyFlags.h | 2 +- cassandra/numpy_parser.pyx | 2 +- cassandra/obj_parser.pyx | 2 +- cassandra/parsing.pxd | 2 +- cassandra/parsing.pyx | 2 +- cassandra/policies.py | 2 +- cassandra/pool.py | 2 +- cassandra/protocol.py | 2 +- cassandra/query.py | 2 +- cassandra/row_parser.pyx | 2 +- cassandra/tuple.pxd | 2 +- cassandra/type_codes.pxd | 2 +- cassandra/util.py | 2 +- docs/conf.py | 2 +- example_core.py | 2 +- example_mapper.py | 2 +- setup.py | 2 +- test-requirements.txt | 2 +- tests/__init__.py | 2 +- tests/integration/__init__.py | 2 +- tests/integration/cqlengine/__init__.py | 4 ++-- tests/integration/cqlengine/base.py | 2 +- tests/integration/cqlengine/columns/__init__.py | 2 +- tests/integration/cqlengine/columns/test_container_columns.py | 2 +- tests/integration/cqlengine/columns/test_counter_column.py | 2 +- tests/integration/cqlengine/columns/test_static_column.py | 2 +- tests/integration/cqlengine/columns/test_validation.py | 2 +- tests/integration/cqlengine/columns/test_value_io.py | 4 ++-- tests/integration/cqlengine/management/__init__.py | 2 +- .../cqlengine/management/test_compaction_settings.py | 2 +- tests/integration/cqlengine/management/test_management.py | 2 +- tests/integration/cqlengine/model/__init__.py | 2 +- tests/integration/cqlengine/model/test_class_construction.py | 2 +- tests/integration/cqlengine/model/test_equality_operations.py | 2 +- tests/integration/cqlengine/model/test_model.py | 2 +- tests/integration/cqlengine/model/test_model_io.py | 2 +- tests/integration/cqlengine/model/test_polymorphism.py | 2 +- tests/integration/cqlengine/model/test_udts.py | 2 +- tests/integration/cqlengine/model/test_updates.py | 2 +- tests/integration/cqlengine/model/test_value_lists.py | 2 +- tests/integration/cqlengine/operators/__init__.py | 2 +- tests/integration/cqlengine/operators/test_base_operator.py | 2 +- tests/integration/cqlengine/operators/test_where_operators.py | 2 +- tests/integration/cqlengine/query/__init__.py | 2 +- tests/integration/cqlengine/query/test_batch_query.py | 2 +- tests/integration/cqlengine/query/test_datetime_queries.py | 2 +- tests/integration/cqlengine/query/test_named.py | 2 +- tests/integration/cqlengine/query/test_queryoperators.py | 2 +- tests/integration/cqlengine/query/test_queryset.py | 2 +- tests/integration/cqlengine/query/test_updates.py | 2 +- tests/integration/cqlengine/statements/__init__.py | 2 +- .../cqlengine/statements/test_assignment_clauses.py | 2 +- .../cqlengine/statements/test_assignment_statement.py | 2 +- tests/integration/cqlengine/statements/test_base_clause.py | 2 +- tests/integration/cqlengine/statements/test_base_statement.py | 2 +- .../integration/cqlengine/statements/test_delete_statement.py | 2 +- .../integration/cqlengine/statements/test_insert_statement.py | 2 +- .../integration/cqlengine/statements/test_select_statement.py | 2 +- .../integration/cqlengine/statements/test_update_statement.py | 2 +- tests/integration/cqlengine/statements/test_where_clause.py | 2 +- tests/integration/cqlengine/test_batch_query.py | 2 +- tests/integration/cqlengine/test_consistency.py | 2 +- tests/integration/cqlengine/test_ifnotexists.py | 2 +- tests/integration/cqlengine/test_timestamp.py | 2 +- tests/integration/cqlengine/test_transaction.py | 2 +- tests/integration/cqlengine/test_ttl.py | 2 +- tests/integration/datatype_utils.py | 2 +- tests/integration/long/__init__.py | 2 +- tests/integration/long/test_consistency.py | 2 +- tests/integration/long/test_failure_types.py | 2 +- tests/integration/long/test_ipv6.py | 4 ++-- tests/integration/long/test_large_data.py | 2 +- tests/integration/long/test_loadbalancingpolicies.py | 2 +- tests/integration/long/test_schema.py | 2 +- tests/integration/long/test_ssl.py | 4 ++-- tests/integration/long/utils.py | 4 ++-- tests/integration/standard/__init__.py | 2 +- tests/integration/standard/test_authentication.py | 2 +- tests/integration/standard/test_client_warnings.py | 2 +- tests/integration/standard/test_cluster.py | 2 +- tests/integration/standard/test_concurrent.py | 2 +- tests/integration/standard/test_connection.py | 2 +- tests/integration/standard/test_control_connection.py | 4 ++-- tests/integration/standard/test_custom_payload.py | 4 ++-- tests/integration/standard/test_custom_protocol_handler.py | 2 +- tests/integration/standard/test_metadata.py | 2 +- tests/integration/standard/test_metrics.py | 2 +- tests/integration/standard/test_prepared_statements.py | 2 +- tests/integration/standard/test_query.py | 2 +- tests/integration/standard/test_query_paging.py | 2 +- tests/integration/standard/test_routing.py | 2 +- tests/integration/standard/test_row_factories.py | 2 +- tests/integration/standard/test_types.py | 2 +- tests/integration/standard/test_udts.py | 2 +- tests/integration/standard/utils.py | 2 +- tests/integration/util.py | 2 +- tests/stress_tests/test_load.py | 2 +- tests/stress_tests/test_multi_inserts.py | 2 +- tests/unit/__init__.py | 2 +- tests/unit/cython/__init__.py | 2 +- tests/unit/cython/bytesio_testhelper.pyx | 2 +- tests/unit/cython/test_bytesio.py | 2 +- tests/unit/cython/utils.py | 2 +- tests/unit/io/__init__.py | 2 +- tests/unit/io/eventlet_utils.py | 2 +- tests/unit/io/gevent_utils.py | 2 +- tests/unit/io/test_asyncorereactor.py | 2 +- tests/unit/io/test_eventletreactor.py | 4 ++-- tests/unit/io/test_geventreactor.py | 2 +- tests/unit/io/test_libevreactor.py | 4 ++-- tests/unit/io/test_libevtimer.py | 2 +- tests/unit/io/test_twistedreactor.py | 2 +- tests/unit/io/utils.py | 2 +- tests/unit/test_concurrent.py | 2 +- tests/unit/test_connection.py | 2 +- tests/unit/test_control_connection.py | 2 +- tests/unit/test_exception.py | 2 +- tests/unit/test_host_connection_pool.py | 2 +- tests/unit/test_marshalling.py | 2 +- tests/unit/test_metadata.py | 2 +- tests/unit/test_orderedmap.py | 2 +- tests/unit/test_parameter_binding.py | 2 +- tests/unit/test_policies.py | 2 +- tests/unit/test_response_future.py | 2 +- tests/unit/test_resultset.py | 2 +- tests/unit/test_sortedset.py | 2 +- tests/unit/test_time_util.py | 2 +- tests/unit/test_types.py | 2 +- tests/unit/test_util_types.py | 2 +- 173 files changed, 182 insertions(+), 182 deletions(-) diff --git a/README.rst b/README.rst index d1feb292..a09e1ef5 100644 --- a/README.rst +++ b/README.rst @@ -69,7 +69,7 @@ Features to be Added License ------- -Copyright 2013-2015 DataStax +Copyright 2013-2016 DataStax Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/benchmarks/base.py b/benchmarks/base.py index 65df5286..812db42a 100644 --- a/benchmarks/base.py +++ b/benchmarks/base.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmarks/callback_full_pipeline.py b/benchmarks/callback_full_pipeline.py index 7baa9194..3736991b 100644 --- a/benchmarks/callback_full_pipeline.py +++ b/benchmarks/callback_full_pipeline.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmarks/future_batches.py b/benchmarks/future_batches.py index a816ff26..91c250bc 100644 --- a/benchmarks/future_batches.py +++ b/benchmarks/future_batches.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmarks/future_full_pipeline.py b/benchmarks/future_full_pipeline.py index 5f3bcebe..40682e04 100644 --- a/benchmarks/future_full_pipeline.py +++ b/benchmarks/future_full_pipeline.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmarks/future_full_throttle.py b/benchmarks/future_full_throttle.py index 1c2059f3..27d87442 100644 --- a/benchmarks/future_full_throttle.py +++ b/benchmarks/future_full_throttle.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/benchmarks/sync.py b/benchmarks/sync.py index d756a58b..531e41fb 100644 --- a/benchmarks/sync.py +++ b/benchmarks/sync.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build.yaml b/build.yaml index 49909596..f7ece90f 100644 --- a/build.yaml +++ b/build.yaml @@ -45,4 +45,4 @@ build: echo "==========RUNNING LONG INTEGRATION TESTS==========" CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=long_results.xml tests/integration/long/ || true - xunit: - - "*_results.xml" \ No newline at end of file + - "*_results.xml" diff --git a/cassandra/__init__.py b/cassandra/__init__.py index cdcd3455..20e9cd28 100644 --- a/cassandra/__init__.py +++ b/cassandra/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/auth.py b/cassandra/auth.py index bb12b5d4..b562728a 100644 --- a/cassandra/auth.py +++ b/cassandra/auth.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/buffer.pxd b/cassandra/buffer.pxd index 2f40ced0..f9976f09 100644 --- a/cassandra/buffer.pxd +++ b/cassandra/buffer.pxd @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/bytesio.pxd b/cassandra/bytesio.pxd index 2bcda361..a0bb083f 100644 --- a/cassandra/bytesio.pxd +++ b/cassandra/bytesio.pxd @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/bytesio.pyx b/cassandra/bytesio.pyx index 68a15baf..33346970 100644 --- a/cassandra/bytesio.pyx +++ b/cassandra/bytesio.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cluster.py b/cassandra/cluster.py index dfa82ec9..ae7a3ece 100644 --- a/cassandra/cluster.py +++ b/cassandra/cluster.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cmurmur3.c b/cassandra/cmurmur3.c index 0ffc3ad5..2f4cfa0f 100644 --- a/cassandra/cmurmur3.c +++ b/cassandra/cmurmur3.c @@ -6,7 +6,7 @@ * * Copyright (c) 2011 Austin Appleby (Murmur3 routine) * Copyright (c) 2011 Patrick Hensley (Python wrapper, packaging) - * Copyright 2013 DataStax (Minor modifications to match Cassandra's MM3 hashes) + * Copyright 2013-2016 DataStax (Minor modifications to match Cassandra's MM3 hashes) * */ diff --git a/cassandra/concurrent.py b/cassandra/concurrent.py index ffc0f908..75c2604d 100644 --- a/cassandra/concurrent.py +++ b/cassandra/concurrent.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/connection.py b/cassandra/connection.py index b54f4516..ec559b09 100644 --- a/cassandra/connection.py +++ b/cassandra/connection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/__init__.py b/cassandra/cqlengine/__init__.py index aeec9be0..48b9da7b 100644 --- a/cassandra/cqlengine/__init__.py +++ b/cassandra/cqlengine/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/columns.py b/cassandra/cqlengine/columns.py index 45851f27..41ec98dd 100644 --- a/cassandra/cqlengine/columns.py +++ b/cassandra/cqlengine/columns.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/connection.py b/cassandra/cqlengine/connection.py index cc9e63d4..09c7582d 100644 --- a/cassandra/cqlengine/connection.py +++ b/cassandra/cqlengine/connection.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/functions.py b/cassandra/cqlengine/functions.py index bc210d69..0200f1fe 100644 --- a/cassandra/cqlengine/functions.py +++ b/cassandra/cqlengine/functions.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/management.py b/cassandra/cqlengine/management.py index d7b6504c..f1b66d95 100644 --- a/cassandra/cqlengine/management.py +++ b/cassandra/cqlengine/management.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/models.py b/cassandra/cqlengine/models.py index f6150680..8210fc28 100644 --- a/cassandra/cqlengine/models.py +++ b/cassandra/cqlengine/models.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/named.py b/cassandra/cqlengine/named.py index 7bc22931..f2f26aed 100644 --- a/cassandra/cqlengine/named.py +++ b/cassandra/cqlengine/named.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/operators.py b/cassandra/cqlengine/operators.py index 5ddbfed8..09c6e1dd 100644 --- a/cassandra/cqlengine/operators.py +++ b/cassandra/cqlengine/operators.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py index fb7af381..1f4a1c3b 100644 --- a/cassandra/cqlengine/query.py +++ b/cassandra/cqlengine/query.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqlengine/statements.py b/cassandra/cqlengine/statements.py index 4c2f728b..ff5384a8 100644 --- a/cassandra/cqlengine/statements.py +++ b/cassandra/cqlengine/statements.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cqltypes.py b/cassandra/cqltypes.py index 6fd98ae4..6e80ed29 100644 --- a/cassandra/cqltypes.py +++ b/cassandra/cqltypes.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cython_marshal.pyx b/cassandra/cython_marshal.pyx index 672c6e82..61b6dacc 100644 --- a/cassandra/cython_marshal.pyx +++ b/cassandra/cython_marshal.pyx @@ -1,6 +1,6 @@ # -- cython: profile=True # -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/cython_utils.pxd b/cassandra/cython_utils.pxd index d2bf7d20..4a1e71db 100644 --- a/cassandra/cython_utils.pxd +++ b/cassandra/cython_utils.pxd @@ -1,2 +1,2 @@ from libc.stdint cimport int64_t -cdef datetime_from_timestamp(double timestamp) \ No newline at end of file +cdef datetime_from_timestamp(double timestamp) diff --git a/cassandra/cython_utils.pyx b/cassandra/cython_utils.pyx index 1d16d47d..ad72f689 100644 --- a/cassandra/cython_utils.pyx +++ b/cassandra/cython_utils.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/deserializers.pxd b/cassandra/deserializers.pxd index 26b4429a..08464170 100644 --- a/cassandra/deserializers.pxd +++ b/cassandra/deserializers.pxd @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/deserializers.pyx b/cassandra/deserializers.pyx index 35fb4036..ac3a009c 100644 --- a/cassandra/deserializers.pyx +++ b/cassandra/deserializers.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/encoder.py b/cassandra/encoder.py index 07c38772..d2254073 100644 --- a/cassandra/encoder.py +++ b/cassandra/encoder.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/io/__init__.py b/cassandra/io/__init__.py index e4b89e5f..87fc3685 100644 --- a/cassandra/io/__init__.py +++ b/cassandra/io/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/io/asyncorereactor.py b/cassandra/io/asyncorereactor.py index dc9d26c6..2a83996d 100644 --- a/cassandra/io/asyncorereactor.py +++ b/cassandra/io/asyncorereactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/io/eventletreactor.py b/cassandra/io/eventletreactor.py index 5706f9cb..c811e15c 100644 --- a/cassandra/io/eventletreactor.py +++ b/cassandra/io/eventletreactor.py @@ -1,5 +1,5 @@ # Copyright 2014 Symantec Corporation -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/io/geventreactor.py b/cassandra/io/geventreactor.py index 1dd013aa..6e62a38b 100644 --- a/cassandra/io/geventreactor.py +++ b/cassandra/io/geventreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/io/libevreactor.py b/cassandra/io/libevreactor.py index 88678cb6..a3e96a9a 100644 --- a/cassandra/io/libevreactor.py +++ b/cassandra/io/libevreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/io/twistedreactor.py b/cassandra/io/twistedreactor.py index cc74bc6c..ccd976bd 100644 --- a/cassandra/io/twistedreactor.py +++ b/cassandra/io/twistedreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/ioutils.pyx b/cassandra/ioutils.pyx index 720c79bb..c59a6a0c 100644 --- a/cassandra/ioutils.pyx +++ b/cassandra/ioutils.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/marshal.py b/cassandra/marshal.py index fba5b789..5a523d63 100644 --- a/cassandra/marshal.py +++ b/cassandra/marshal.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/metadata.py b/cassandra/metadata.py index 19bf5fea..1d04b4c9 100644 --- a/cassandra/metadata.py +++ b/cassandra/metadata.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/metrics.py b/cassandra/metrics.py index 77ed8961..cf1f25c1 100644 --- a/cassandra/metrics.py +++ b/cassandra/metrics.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/numpyFlags.h b/cassandra/numpyFlags.h index 6793b7a8..db464ed9 100644 --- a/cassandra/numpyFlags.h +++ b/cassandra/numpyFlags.h @@ -1 +1 @@ -#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION \ No newline at end of file +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION diff --git a/cassandra/numpy_parser.pyx b/cassandra/numpy_parser.pyx index 9ced45ef..920a3efd 100644 --- a/cassandra/numpy_parser.pyx +++ b/cassandra/numpy_parser.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/obj_parser.pyx b/cassandra/obj_parser.pyx index 8aa5b394..2ec889eb 100644 --- a/cassandra/obj_parser.pyx +++ b/cassandra/obj_parser.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/parsing.pxd b/cassandra/parsing.pxd index 278c6e71..abfc74d1 100644 --- a/cassandra/parsing.pxd +++ b/cassandra/parsing.pxd @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/parsing.pyx b/cassandra/parsing.pyx index c44d7f5a..06cfe0bb 100644 --- a/cassandra/parsing.pyx +++ b/cassandra/parsing.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/policies.py b/cassandra/policies.py index 95c7829c..595717ca 100644 --- a/cassandra/policies.py +++ b/cassandra/policies.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/pool.py b/cassandra/pool.py index a810d603..08cfd372 100644 --- a/cassandra/pool.py +++ b/cassandra/pool.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/protocol.py b/cassandra/protocol.py index 8a405a1c..633c9734 100644 --- a/cassandra/protocol.py +++ b/cassandra/protocol.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/query.py b/cassandra/query.py index a6832488..01bf7269 100644 --- a/cassandra/query.py +++ b/cassandra/query.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/row_parser.pyx b/cassandra/row_parser.pyx index fc7bce15..ec2b83be 100644 --- a/cassandra/row_parser.pyx +++ b/cassandra/row_parser.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/tuple.pxd b/cassandra/tuple.pxd index 746205e2..840cb7eb 100644 --- a/cassandra/tuple.pxd +++ b/cassandra/tuple.pxd @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/type_codes.pxd b/cassandra/type_codes.pxd index 90f29bc9..b7e491f0 100644 --- a/cassandra/type_codes.pxd +++ b/cassandra/type_codes.pxd @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/cassandra/util.py b/cassandra/util.py index 224ee878..6e22bcee 100644 --- a/cassandra/util.py +++ b/cassandra/util.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docs/conf.py b/docs/conf.py index 782044ab..8174f13a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,7 +43,7 @@ master_doc = 'index' # General information about the project. project = u'Cassandra Driver' -copyright = u'2014, DataStax' +copyright 2013-2016 DataStax' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/example_core.py b/example_core.py index c7221880..3235c79b 100644 --- a/example_core.py +++ b/example_core.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/example_mapper.py b/example_mapper.py index 31a39eec..4d5ebca3 100755 --- a/example_mapper.py +++ b/example_mapper.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/setup.py b/setup.py index 2ece7e6d..f5070fdb 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/test-requirements.txt b/test-requirements.txt index 50875b66..4c917da6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,4 +11,4 @@ pure-sasl twisted gevent>=1.0 eventlet -cython>=0.21 \ No newline at end of file +cython>=0.21 diff --git a/tests/__init__.py b/tests/__init__.py index 150e600c..abfb8bf7 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index 9a3b9af9..e022626b 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/__init__.py b/tests/integration/cqlengine/__init__.py index e89c4778..2950984f 100644 --- a/tests/integration/cqlengine/__init__.py +++ b/tests/integration/cqlengine/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -42,4 +42,4 @@ def setup_connection(keyspace_name): connection.setup(['127.0.0.1'], consistency=ConsistencyLevel.ONE, protocol_version=PROTOCOL_VERSION, - default_keyspace=keyspace_name) \ No newline at end of file + default_keyspace=keyspace_name) diff --git a/tests/integration/cqlengine/base.py b/tests/integration/cqlengine/base.py index 856f2bac..5536efb3 100644 --- a/tests/integration/cqlengine/base.py +++ b/tests/integration/cqlengine/base.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/columns/__init__.py b/tests/integration/cqlengine/columns/__init__.py index 55181d93..87fc3685 100644 --- a/tests/integration/cqlengine/columns/__init__.py +++ b/tests/integration/cqlengine/columns/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/columns/test_container_columns.py b/tests/integration/cqlengine/columns/test_container_columns.py index ad67419c..8aa5491a 100644 --- a/tests/integration/cqlengine/columns/test_container_columns.py +++ b/tests/integration/cqlengine/columns/test_container_columns.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/columns/test_counter_column.py b/tests/integration/cqlengine/columns/test_counter_column.py index c9579ba7..11e5c1bd 100644 --- a/tests/integration/cqlengine/columns/test_counter_column.py +++ b/tests/integration/cqlengine/columns/test_counter_column.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/columns/test_static_column.py b/tests/integration/cqlengine/columns/test_static_column.py index a4864050..543dc847 100644 --- a/tests/integration/cqlengine/columns/test_static_column.py +++ b/tests/integration/cqlengine/columns/test_static_column.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/columns/test_validation.py b/tests/integration/cqlengine/columns/test_validation.py index 87323754..4609cca1 100644 --- a/tests/integration/cqlengine/columns/test_validation.py +++ b/tests/integration/cqlengine/columns/test_validation.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/columns/test_value_io.py b/tests/integration/cqlengine/columns/test_value_io.py index cd9f63f2..455f80c1 100644 --- a/tests/integration/cqlengine/columns/test_value_io.py +++ b/tests/integration/cqlengine/columns/test_value_io.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -268,4 +268,4 @@ class TestTinyInt(ProtocolV4Test): column = columns.TinyInt pkey_val = 1 - data_val = 123 \ No newline at end of file + data_val = 123 diff --git a/tests/integration/cqlengine/management/__init__.py b/tests/integration/cqlengine/management/__init__.py index 55181d93..87fc3685 100644 --- a/tests/integration/cqlengine/management/__init__.py +++ b/tests/integration/cqlengine/management/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/management/test_compaction_settings.py b/tests/integration/cqlengine/management/test_compaction_settings.py index a6717654..4fe349e0 100644 --- a/tests/integration/cqlengine/management/test_compaction_settings.py +++ b/tests/integration/cqlengine/management/test_compaction_settings.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/management/test_management.py b/tests/integration/cqlengine/management/test_management.py index 69e335c7..93aa8dc1 100644 --- a/tests/integration/cqlengine/management/test_management.py +++ b/tests/integration/cqlengine/management/test_management.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/__init__.py b/tests/integration/cqlengine/model/__init__.py index 55181d93..87fc3685 100644 --- a/tests/integration/cqlengine/model/__init__.py +++ b/tests/integration/cqlengine/model/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_class_construction.py b/tests/integration/cqlengine/model/test_class_construction.py index 18cda48f..7b333a58 100644 --- a/tests/integration/cqlengine/model/test_class_construction.py +++ b/tests/integration/cqlengine/model/test_class_construction.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_equality_operations.py b/tests/integration/cqlengine/model/test_equality_operations.py index 8ed38327..9391ce6a 100644 --- a/tests/integration/cqlengine/model/test_equality_operations.py +++ b/tests/integration/cqlengine/model/test_equality_operations.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_model.py b/tests/integration/cqlengine/model/test_model.py index b66e284f..a22080fa 100644 --- a/tests/integration/cqlengine/model/test_model.py +++ b/tests/integration/cqlengine/model/test_model.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_model_io.py b/tests/integration/cqlengine/model/test_model_io.py index 96c1f63b..f513c2e1 100644 --- a/tests/integration/cqlengine/model/test_model_io.py +++ b/tests/integration/cqlengine/model/test_model_io.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_polymorphism.py b/tests/integration/cqlengine/model/test_polymorphism.py index f8969e32..18feb653 100644 --- a/tests/integration/cqlengine/model/test_polymorphism.py +++ b/tests/integration/cqlengine/model/test_polymorphism.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_udts.py b/tests/integration/cqlengine/model/test_udts.py index e39fc219..859842b1 100644 --- a/tests/integration/cqlengine/model/test_udts.py +++ b/tests/integration/cqlengine/model/test_udts.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_updates.py b/tests/integration/cqlengine/model/test_updates.py index ff8d8ecf..242bffe1 100644 --- a/tests/integration/cqlengine/model/test_updates.py +++ b/tests/integration/cqlengine/model/test_updates.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/model/test_value_lists.py b/tests/integration/cqlengine/model/test_value_lists.py index 28b5a0d8..8bd9b218 100644 --- a/tests/integration/cqlengine/model/test_value_lists.py +++ b/tests/integration/cqlengine/model/test_value_lists.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/operators/__init__.py b/tests/integration/cqlengine/operators/__init__.py index 33f8baac..a6c81ff1 100644 --- a/tests/integration/cqlengine/operators/__init__.py +++ b/tests/integration/cqlengine/operators/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/operators/test_base_operator.py b/tests/integration/cqlengine/operators/test_base_operator.py index 8df0da7f..d4521783 100644 --- a/tests/integration/cqlengine/operators/test_base_operator.py +++ b/tests/integration/cqlengine/operators/test_base_operator.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/operators/test_where_operators.py b/tests/integration/cqlengine/operators/test_where_operators.py index aa59f139..d3885c27 100644 --- a/tests/integration/cqlengine/operators/test_where_operators.py +++ b/tests/integration/cqlengine/operators/test_where_operators.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/__init__.py b/tests/integration/cqlengine/query/__init__.py index 55181d93..87fc3685 100644 --- a/tests/integration/cqlengine/query/__init__.py +++ b/tests/integration/cqlengine/query/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/test_batch_query.py b/tests/integration/cqlengine/query/test_batch_query.py index 4a3e2131..5aea7e9c 100644 --- a/tests/integration/cqlengine/query/test_batch_query.py +++ b/tests/integration/cqlengine/query/test_batch_query.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/test_datetime_queries.py b/tests/integration/cqlengine/query/test_datetime_queries.py index ebce19f4..118d74dd 100644 --- a/tests/integration/cqlengine/query/test_datetime_queries.py +++ b/tests/integration/cqlengine/query/test_datetime_queries.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/test_named.py b/tests/integration/cqlengine/query/test_named.py index dbe664b3..3b51d1d2 100644 --- a/tests/integration/cqlengine/query/test_named.py +++ b/tests/integration/cqlengine/query/test_named.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/test_queryoperators.py b/tests/integration/cqlengine/query/test_queryoperators.py index f3154de9..af10435c 100644 --- a/tests/integration/cqlengine/query/test_queryoperators.py +++ b/tests/integration/cqlengine/query/test_queryoperators.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/test_queryset.py b/tests/integration/cqlengine/query/test_queryset.py index db7c0c23..1dc037ce 100644 --- a/tests/integration/cqlengine/query/test_queryset.py +++ b/tests/integration/cqlengine/query/test_queryset.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/query/test_updates.py b/tests/integration/cqlengine/query/test_updates.py index 6c539012..49e6f7f1 100644 --- a/tests/integration/cqlengine/query/test_updates.py +++ b/tests/integration/cqlengine/query/test_updates.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/__init__.py b/tests/integration/cqlengine/statements/__init__.py index 33f8baac..a6c81ff1 100644 --- a/tests/integration/cqlengine/statements/__init__.py +++ b/tests/integration/cqlengine/statements/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_assignment_clauses.py b/tests/integration/cqlengine/statements/test_assignment_clauses.py index 9874fddc..4fc3a283 100644 --- a/tests/integration/cqlengine/statements/test_assignment_clauses.py +++ b/tests/integration/cqlengine/statements/test_assignment_clauses.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_assignment_statement.py b/tests/integration/cqlengine/statements/test_assignment_statement.py index 18f08dd2..9d5481d9 100644 --- a/tests/integration/cqlengine/statements/test_assignment_statement.py +++ b/tests/integration/cqlengine/statements/test_assignment_statement.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_base_clause.py b/tests/integration/cqlengine/statements/test_base_clause.py index 2cb1bc2f..14d98782 100644 --- a/tests/integration/cqlengine/statements/test_base_clause.py +++ b/tests/integration/cqlengine/statements/test_base_clause.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_base_statement.py b/tests/integration/cqlengine/statements/test_base_statement.py index 2d0f30e4..2a9bb80f 100644 --- a/tests/integration/cqlengine/statements/test_base_statement.py +++ b/tests/integration/cqlengine/statements/test_base_statement.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_delete_statement.py b/tests/integration/cqlengine/statements/test_delete_statement.py index c8283e2b..701991f4 100644 --- a/tests/integration/cqlengine/statements/test_delete_statement.py +++ b/tests/integration/cqlengine/statements/test_delete_statement.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_insert_statement.py b/tests/integration/cqlengine/statements/test_insert_statement.py index 75a2e71b..dc6465e2 100644 --- a/tests/integration/cqlengine/statements/test_insert_statement.py +++ b/tests/integration/cqlengine/statements/test_insert_statement.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_select_statement.py b/tests/integration/cqlengine/statements/test_select_statement.py index 4f920ce0..0df2803d 100644 --- a/tests/integration/cqlengine/statements/test_select_statement.py +++ b/tests/integration/cqlengine/statements/test_select_statement.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_update_statement.py b/tests/integration/cqlengine/statements/test_update_statement.py index 6c7bea6d..a8ff865e 100644 --- a/tests/integration/cqlengine/statements/test_update_statement.py +++ b/tests/integration/cqlengine/statements/test_update_statement.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/statements/test_where_clause.py b/tests/integration/cqlengine/statements/test_where_clause.py index 542cb1f9..e3d95d4f 100644 --- a/tests/integration/cqlengine/statements/test_where_clause.py +++ b/tests/integration/cqlengine/statements/test_where_clause.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/test_batch_query.py b/tests/integration/cqlengine/test_batch_query.py index a83dd2e9..b28b533a 100644 --- a/tests/integration/cqlengine/test_batch_query.py +++ b/tests/integration/cqlengine/test_batch_query.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/test_consistency.py b/tests/integration/cqlengine/test_consistency.py index 6d8e0388..61cf3f0d 100644 --- a/tests/integration/cqlengine/test_consistency.py +++ b/tests/integration/cqlengine/test_consistency.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/test_ifnotexists.py b/tests/integration/cqlengine/test_ifnotexists.py index 6a438735..3fc95d2d 100644 --- a/tests/integration/cqlengine/test_ifnotexists.py +++ b/tests/integration/cqlengine/test_ifnotexists.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/test_timestamp.py b/tests/integration/cqlengine/test_timestamp.py index dde4334a..9b3ffbea 100644 --- a/tests/integration/cqlengine/test_timestamp.py +++ b/tests/integration/cqlengine/test_timestamp.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/test_transaction.py b/tests/integration/cqlengine/test_transaction.py index eec6c631..b3d7ea0f 100644 --- a/tests/integration/cqlengine/test_transaction.py +++ b/tests/integration/cqlengine/test_transaction.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/cqlengine/test_ttl.py b/tests/integration/cqlengine/test_ttl.py index 811fdbad..ba2c1e09 100644 --- a/tests/integration/cqlengine/test_ttl.py +++ b/tests/integration/cqlengine/test_ttl.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/datatype_utils.py b/tests/integration/datatype_utils.py index 80087b67..ee9695c2 100644 --- a/tests/integration/datatype_utils.py +++ b/tests/integration/datatype_utils.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/__init__.py b/tests/integration/long/__init__.py index 794d75bf..caa7e716 100644 --- a/tests/integration/long/__init__.py +++ b/tests/integration/long/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/test_consistency.py b/tests/integration/long/test_consistency.py index f46fedce..43734c7d 100644 --- a/tests/integration/long/test_consistency.py +++ b/tests/integration/long/test_consistency.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/test_failure_types.py b/tests/integration/long/test_failure_types.py index e611adca..7654fbcc 100644 --- a/tests/integration/long/test_failure_types.py +++ b/tests/integration/long/test_failure_types.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/test_ipv6.py b/tests/integration/long/test_ipv6.py index e17f22aa..618050fe 100644 --- a/tests/integration/long/test_ipv6.py +++ b/tests/integration/long/test_ipv6.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -121,4 +121,4 @@ class AsyncoreConnectionTests(IPV6ConnectionTest, unittest.TestCase): raise unittest.SkipTest("IPv6 is currently not supported under Windows") if AsyncoreConnection == -1: - raise unittest.SkipTest("Can't test asyncore with monkey patching") \ No newline at end of file + raise unittest.SkipTest("Can't test asyncore with monkey patching") diff --git a/tests/integration/long/test_large_data.py b/tests/integration/long/test_large_data.py index 4316a7b9..acac0989 100644 --- a/tests/integration/long/test_large_data.py +++ b/tests/integration/long/test_large_data.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/test_loadbalancingpolicies.py b/tests/integration/long/test_loadbalancingpolicies.py index 155115d1..f0525317 100644 --- a/tests/integration/long/test_loadbalancingpolicies.py +++ b/tests/integration/long/test_loadbalancingpolicies.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/test_schema.py b/tests/integration/long/test_schema.py index 51a2c72d..ba480a19 100644 --- a/tests/integration/long/test_schema.py +++ b/tests/integration/long/test_schema.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/long/test_ssl.py b/tests/integration/long/test_ssl.py index 0df25016..fc6a7066 100644 --- a/tests/integration/long/test_ssl.py +++ b/tests/integration/long/test_ssl.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -238,4 +238,4 @@ class SSLConnectionAuthTests(unittest.TestCase): 'keyfile': abs_driver_keyfile, 'certfile': abs_driver_certfile}) with self.assertRaises(NoHostAvailable) as context: - cluster.connect() \ No newline at end of file + cluster.connect() diff --git a/tests/integration/long/utils.py b/tests/integration/long/utils.py index 08957e4d..f850d6a1 100644 --- a/tests/integration/long/utils.py +++ b/tests/integration/long/utils.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -155,4 +155,4 @@ def wait_for_down(cluster, node, wait=True): tries += 1 time.sleep(1) - raise RuntimeError("Host {0} is not down after 100 attempts".format(IP_FORMAT.format(node))) \ No newline at end of file + raise RuntimeError("Host {0} is not down after 100 attempts".format(IP_FORMAT.format(node))) diff --git a/tests/integration/standard/__init__.py b/tests/integration/standard/__init__.py index 484ed237..ba5c6e26 100644 --- a/tests/integration/standard/__init__.py +++ b/tests/integration/standard/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_authentication.py b/tests/integration/standard/test_authentication.py index 82f81cd8..473b398a 100644 --- a/tests/integration/standard/test_authentication.py +++ b/tests/integration/standard/test_authentication.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_client_warnings.py b/tests/integration/standard/test_client_warnings.py index 90f22482..a463578f 100644 --- a/tests/integration/standard/test_client_warnings.py +++ b/tests/integration/standard/test_client_warnings.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_cluster.py b/tests/integration/standard/test_cluster.py index 9baaf9fb..003c78a9 100644 --- a/tests/integration/standard/test_cluster.py +++ b/tests/integration/standard/test_cluster.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_concurrent.py b/tests/integration/standard/test_concurrent.py index a0cf79fa..60243bb6 100644 --- a/tests/integration/standard/test_concurrent.py +++ b/tests/integration/standard/test_concurrent.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_connection.py b/tests/integration/standard/test_connection.py index eabf2a4a..d8c45511 100644 --- a/tests/integration/standard/test_connection.py +++ b/tests/integration/standard/test_connection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_control_connection.py b/tests/integration/standard/test_control_connection.py index 52723243..07c5bac9 100644 --- a/tests/integration/standard/test_control_connection.py +++ b/tests/integration/standard/test_control_connection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -75,4 +75,4 @@ class ControlConnectionTests(unittest.TestCase): cc_id_pre_drop = id(self.cluster.control_connection._connection) self.session.execute("DROP KEYSPACE keyspacetodrop") cc_id_post_drop = id(self.cluster.control_connection._connection) - self.assertEqual(cc_id_post_drop, cc_id_pre_drop) \ No newline at end of file + self.assertEqual(cc_id_post_drop, cc_id_pre_drop) diff --git a/tests/integration/standard/test_custom_payload.py b/tests/integration/standard/test_custom_payload.py index e6a80d03..3d4b8496 100644 --- a/tests/integration/standard/test_custom_payload.py +++ b/tests/integration/standard/test_custom_payload.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -164,4 +164,4 @@ class CustomPayloadTests(unittest.TestCase): response_future = self.session.execute_async(statement, custom_payload=custom_payload) response_future.result() returned_custom_payload = response_future.custom_payload - self.assertEqual(custom_payload, returned_custom_payload) \ No newline at end of file + self.assertEqual(custom_payload, returned_custom_payload) diff --git a/tests/integration/standard/test_custom_protocol_handler.py b/tests/integration/standard/test_custom_protocol_handler.py index 1427b3b0..63a83809 100644 --- a/tests/integration/standard/test_custom_protocol_handler.py +++ b/tests/integration/standard/test_custom_protocol_handler.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py index 78589d5b..583943bc 100644 --- a/tests/integration/standard/test_metadata.py +++ b/tests/integration/standard/test_metadata.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_metrics.py b/tests/integration/standard/test_metrics.py index 70da6710..48627b3f 100644 --- a/tests/integration/standard/test_metrics.py +++ b/tests/integration/standard/test_metrics.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_prepared_statements.py b/tests/integration/standard/test_prepared_statements.py index 4a149613..63f62f23 100644 --- a/tests/integration/standard/test_prepared_statements.py +++ b/tests/integration/standard/test_prepared_statements.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_query.py b/tests/integration/standard/test_query.py index b087031e..4ae63606 100644 --- a/tests/integration/standard/test_query.py +++ b/tests/integration/standard/test_query.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_query_paging.py b/tests/integration/standard/test_query_paging.py index f9e943f9..fdad1bc3 100644 --- a/tests/integration/standard/test_query_paging.py +++ b/tests/integration/standard/test_query_paging.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_routing.py b/tests/integration/standard/test_routing.py index 8172f8fc..1ad0a2fa 100644 --- a/tests/integration/standard/test_routing.py +++ b/tests/integration/standard/test_routing.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_row_factories.py b/tests/integration/standard/test_row_factories.py index e6d6184a..a1864648 100644 --- a/tests/integration/standard/test_row_factories.py +++ b/tests/integration/standard/test_row_factories.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_types.py b/tests/integration/standard/test_types.py index e296286c..acac7b81 100644 --- a/tests/integration/standard/test_types.py +++ b/tests/integration/standard/test_types.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/test_udts.py b/tests/integration/standard/test_udts.py index 5c6b0d66..8d4411a1 100644 --- a/tests/integration/standard/test_udts.py +++ b/tests/integration/standard/test_udts.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/integration/standard/utils.py b/tests/integration/standard/utils.py index fe54f04d..8749c5e3 100644 --- a/tests/integration/standard/utils.py +++ b/tests/integration/standard/utils.py @@ -50,4 +50,4 @@ def get_all_primitive_params(key): def get_primitive_datatypes(): - return ['int'] + list(PRIMITIVE_DATATYPES) \ No newline at end of file + return ['int'] + list(PRIMITIVE_DATATYPES) diff --git a/tests/integration/util.py b/tests/integration/util.py index aab61784..ff71185a 100644 --- a/tests/integration/util.py +++ b/tests/integration/util.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/stress_tests/test_load.py b/tests/stress_tests/test_load.py index 6283d2e4..523ee200 100644 --- a/tests/stress_tests/test_load.py +++ b/tests/stress_tests/test_load.py @@ -1,4 +1,4 @@ -# Copyright 2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/stress_tests/test_multi_inserts.py b/tests/stress_tests/test_multi_inserts.py index 12b5b70e..e39e73e8 100644 --- a/tests/stress_tests/test_multi_inserts.py +++ b/tests/stress_tests/test_multi_inserts.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index e4b89e5f..87fc3685 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/cython/__init__.py b/tests/unit/cython/__init__.py index e4b89e5f..87fc3685 100644 --- a/tests/unit/cython/__init__.py +++ b/tests/unit/cython/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/cython/bytesio_testhelper.pyx b/tests/unit/cython/bytesio_testhelper.pyx index d557c037..e86fdb73 100644 --- a/tests/unit/cython/bytesio_testhelper.pyx +++ b/tests/unit/cython/bytesio_testhelper.pyx @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/cython/test_bytesio.py b/tests/unit/cython/test_bytesio.py index 2dbf1311..0c2ae7bf 100644 --- a/tests/unit/cython/test_bytesio.py +++ b/tests/unit/cython/test_bytesio.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/cython/utils.py b/tests/unit/cython/utils.py index 0d9a4c2b..6dbeb15c 100644 --- a/tests/unit/cython/utils.py +++ b/tests/unit/cython/utils.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/__init__.py b/tests/unit/io/__init__.py index e4b89e5f..87fc3685 100644 --- a/tests/unit/io/__init__.py +++ b/tests/unit/io/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/eventlet_utils.py b/tests/unit/io/eventlet_utils.py index 8aee030f..e06d3f77 100644 --- a/tests/unit/io/eventlet_utils.py +++ b/tests/unit/io/eventlet_utils.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/gevent_utils.py b/tests/unit/io/gevent_utils.py index 1c6e27ad..12aab8d2 100644 --- a/tests/unit/io/gevent_utils.py +++ b/tests/unit/io/gevent_utils.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/test_asyncorereactor.py b/tests/unit/io/test_asyncorereactor.py index 16fbf2fb..ab5bd640 100644 --- a/tests/unit/io/test_asyncorereactor.py +++ b/tests/unit/io/test_asyncorereactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/test_eventletreactor.py b/tests/unit/io/test_eventletreactor.py index 9f071d3b..6aa76fa7 100644 --- a/tests/unit/io/test_eventletreactor.py +++ b/tests/unit/io/test_eventletreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -64,4 +64,4 @@ class EventletTimerTest(unittest.TestCase): # Assert that the cancellation was honored self.assertFalse(timer_manager._queue) self.assertFalse(timer_manager._new_timers) - self.assertFalse(callback.was_invoked()) \ No newline at end of file + self.assertFalse(callback.was_invoked()) diff --git a/tests/unit/io/test_geventreactor.py b/tests/unit/io/test_geventreactor.py index c90be37d..cf28b93d 100644 --- a/tests/unit/io/test_geventreactor.py +++ b/tests/unit/io/test_geventreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/test_libevreactor.py b/tests/unit/io/test_libevreactor.py index 2b26343a..309134c9 100644 --- a/tests/unit/io/test_libevreactor.py +++ b/tests/unit/io/test_libevreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -295,4 +295,4 @@ class LibevConnectionTest(unittest.TestCase): c.handle_read(None, 0) self.assertTrue(c.connected_event.is_set()) - self.assertFalse(c.is_defunct) \ No newline at end of file + self.assertFalse(c.is_defunct) diff --git a/tests/unit/io/test_libevtimer.py b/tests/unit/io/test_libevtimer.py index 988282c2..4b21d031 100644 --- a/tests/unit/io/test_libevtimer.py +++ b/tests/unit/io/test_libevtimer.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/test_twistedreactor.py b/tests/unit/io/test_twistedreactor.py index 5c6bb2d0..fd418146 100644 --- a/tests/unit/io/test_twistedreactor.py +++ b/tests/unit/io/test_twistedreactor.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/io/utils.py b/tests/unit/io/utils.py index de6a43fe..58ed78ea 100644 --- a/tests/unit/io/utils.py +++ b/tests/unit/io/utils.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_concurrent.py b/tests/unit/test_concurrent.py index d120cd4a..a1f95322 100644 --- a/tests/unit/test_concurrent.py +++ b/tests/unit/test_concurrent.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py index 8055a5e7..b306708c 100644 --- a/tests/unit/test_connection.py +++ b/tests/unit/test_connection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_control_connection.py b/tests/unit/test_control_connection.py index b6095822..9fac7e2f 100644 --- a/tests/unit/test_control_connection.py +++ b/tests/unit/test_control_connection.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_exception.py b/tests/unit/test_exception.py index f882c537..a88b5260 100644 --- a/tests/unit/test_exception.py +++ b/tests/unit/test_exception.py @@ -1,4 +1,4 @@ -# Copyright 2014 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_host_connection_pool.py b/tests/unit/test_host_connection_pool.py index 79391a2a..fb0ca217 100644 --- a/tests/unit/test_host_connection_pool.py +++ b/tests/unit/test_host_connection_pool.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_marshalling.py b/tests/unit/test_marshalling.py index c7aea355..626c38b2 100644 --- a/tests/unit/test_marshalling.py +++ b/tests/unit/test_marshalling.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_metadata.py b/tests/unit/test_metadata.py index fc927a02..c2e3513f 100644 --- a/tests/unit/test_metadata.py +++ b/tests/unit/test_metadata.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_orderedmap.py b/tests/unit/test_orderedmap.py index a7fbef13..98f0ba9a 100644 --- a/tests/unit/test_orderedmap.py +++ b/tests/unit/test_orderedmap.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_parameter_binding.py b/tests/unit/test_parameter_binding.py index 7da3ed93..d48b5d95 100644 --- a/tests/unit/test_parameter_binding.py +++ b/tests/unit/test_parameter_binding.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_policies.py b/tests/unit/test_policies.py index 74daab99..a9406cf7 100644 --- a/tests/unit/test_policies.py +++ b/tests/unit/test_policies.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_response_future.py b/tests/unit/test_response_future.py index 5c59259b..8e047d91 100644 --- a/tests/unit/test_response_future.py +++ b/tests/unit/test_response_future.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_resultset.py b/tests/unit/test_resultset.py index 2a683767..252b6e05 100644 --- a/tests/unit/test_resultset.py +++ b/tests/unit/test_resultset.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_sortedset.py b/tests/unit/test_sortedset.py index 99d8d365..a2b26471 100644 --- a/tests/unit/test_sortedset.py +++ b/tests/unit/test_sortedset.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_time_util.py b/tests/unit/test_time_util.py index 1c3dc1b4..8e767acc 100644 --- a/tests/unit/test_time_util.py +++ b/tests/unit/test_time_util.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_types.py b/tests/unit/test_types.py index 18d40956..f6f618de 100644 --- a/tests/unit/test_types.py +++ b/tests/unit/test_types.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/tests/unit/test_util_types.py b/tests/unit/test_util_types.py index 7cf6c1f4..53ab9d07 100644 --- a/tests/unit/test_util_types.py +++ b/tests/unit/test_util_types.py @@ -1,4 +1,4 @@ -# Copyright 2013-2015 DataStax, Inc. +# Copyright 2013-2016 DataStax, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.