Skip to content

Commit 9865596

Browse files
rakshith91annatisch
rakshith91
authored and
annatisch
committed
Final changes (Azure#6689)
* Fix for queue models (Azure#6681) * Some final tweaks * oops * comments * little better * Pylint
1 parent 9fd47c8 commit 9865596

File tree

18 files changed

+49
-26
lines changed

18 files changed

+49
-26
lines changed

‎sdk/storage/azure-storage-blob/azure/storage/blob/_shared/base_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ def format_shared_key_credential(account, credential):
197197

198198
def parse_connection_str(conn_str, credential, service):
199199
conn_str = conn_str.rstrip(";")
200-
conn_settings = dict(
200+
conn_settings = dict( # pylint: disable=consider-using-dict-comprehension
201201
[s.split("=", 1) for s in conn_str.split(";")]
202-
) # pylint: disable=consider-using-dict-comprehension
202+
)
203203
endpoints = _SERVICE_PARAMS[service]
204204
primary = None
205205
secondary = None

‎sdk/storage/azure-storage-blob/azure/storage/blob/_shared/downloads.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,10 @@ def download_to_stream(self, stream, max_connections=1):
465465
if max_connections > 1:
466466
import concurrent.futures
467467
executor = concurrent.futures.ThreadPoolExecutor(max_connections)
468-
list(executor.map(tracing_context.with_current_context(downloader.process_chunk), downloader.get_chunk_offsets()))
468+
list(executor.map(
469+
tracing_context.with_current_context(downloader.process_chunk),
470+
downloader.get_chunk_offsets()
471+
))
469472
else:
470473
for chunk in downloader.get_chunk_offsets():
471474
downloader.process_chunk(chunk)

‎sdk/storage/azure-storage-blob/azure/storage/blob/aio/blob_service_client_async.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,11 @@ def list_containers(
310310
timeout=timeout,
311311
**kwargs)
312312
return AsyncItemPaged(
313-
command, prefix=name_starts_with, results_per_page=results_per_page, page_iterator_class=ContainerPropertiesPaged)
313+
command,
314+
prefix=name_starts_with,
315+
results_per_page=results_per_page,
316+
page_iterator_class=ContainerPropertiesPaged
317+
)
314318

315319
async def create_container(
316320
self, name, # type: str

‎sdk/storage/azure-storage-blob/azure/storage/blob/aio/container_client_async.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,12 @@ def list_blobs(self, name_starts_with=None, include=None, timeout=None, **kwargs
511511
include=include,
512512
timeout=timeout,
513513
**kwargs)
514-
return AsyncItemPaged(command, prefix=name_starts_with, results_per_page=results_per_page, page_iterator_class=BlobPropertiesPaged)
514+
return AsyncItemPaged(
515+
command,
516+
prefix=name_starts_with,
517+
results_per_page=results_per_page,
518+
page_iterator_class=BlobPropertiesPaged
519+
)
515520

516521
def walk_blobs(
517522
self, name_starts_with=None, # type: Optional[str]

‎sdk/storage/azure-storage-blob/azure/storage/blob/blob_service_client.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,11 @@ def list_containers(
424424
timeout=timeout,
425425
**kwargs)
426426
return ItemPaged(
427-
command, prefix=name_starts_with, results_per_page=results_per_page, page_iterator_class=ContainerPropertiesPaged)
427+
command,
428+
prefix=name_starts_with,
429+
results_per_page=results_per_page,
430+
page_iterator_class=ContainerPropertiesPaged
431+
)
428432

429433
@distributed_trace
430434
def create_container(

‎sdk/storage/azure-storage-blob/azure/storage/blob/container_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
from .blob_client import BlobClient
4545

4646
if TYPE_CHECKING:
47-
from azure.core.pipeline.transport import HttpTransport
48-
from azure.core.pipeline.policies import HTTPPolicy
47+
from azure.core.pipeline.transport import HttpTransport # pylint: disable=ungrouped-imports
48+
from azure.core.pipeline.policies import HTTPPolicy # pylint: disable=ungrouped-imports
4949
from .models import ContainerPermissions, PublicAccess
5050
from datetime import datetime
5151
from .models import ( # pylint: disable=unused-import

‎sdk/storage/azure-storage-blob/tests/test_large_block_blob.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import pytest
1010

1111
import os
12+
import platform
1213
import unittest
1314

1415
from azure.storage.blob import (
@@ -36,7 +37,8 @@
3637
LARGE_BLOCK_SIZE = 6 * 1024 * 1024
3738

3839
# ------------------------------------------------------------------------------
39-
40+
if platform.python_implementation() == 'PyPy':
41+
pytest.skip("Skip tests for Pypy", allow_module_level=True)
4042

4143
class StorageLargeBlockBlobTest(StorageTestCase):
4244
def setUp(self):

‎sdk/storage/azure-storage-file/azure/storage/file/_shared/base_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ def format_shared_key_credential(account, credential):
197197

198198
def parse_connection_str(conn_str, credential, service):
199199
conn_str = conn_str.rstrip(";")
200-
conn_settings = dict(
200+
conn_settings = dict( # pylint: disable=consider-using-dict-comprehension
201201
[s.split("=", 1) for s in conn_str.split(";")]
202-
) # pylint: disable=consider-using-dict-comprehension
202+
)
203203
endpoints = _SERVICE_PARAMS[service]
204204
primary = None
205205
secondary = None

‎sdk/storage/azure-storage-file/azure/storage/file/_shared/downloads.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,10 @@ def download_to_stream(self, stream, max_connections=1):
465465
if max_connections > 1:
466466
import concurrent.futures
467467
executor = concurrent.futures.ThreadPoolExecutor(max_connections)
468-
list(executor.map(tracing_context.with_current_context(downloader.process_chunk), downloader.get_chunk_offsets()))
468+
list(executor.map(
469+
tracing_context.with_current_context(downloader.process_chunk),
470+
downloader.get_chunk_offsets()
471+
))
469472
else:
470473
for chunk in downloader.get_chunk_offsets():
471474
downloader.process_chunk(chunk)

‎sdk/storage/azure-storage-file/azure/storage/file/aio/file_client_async.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,4 +728,3 @@ async def close_handles(
728728

729729
polling_method = CloseHandlesAsync(self._config.copy_polling_interval)
730730
return async_poller(command, start_close, None, polling_method)
731-

‎sdk/storage/azure-storage-queue/azure/storage/queue/_shared/base_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ def format_shared_key_credential(account, credential):
197197

198198
def parse_connection_str(conn_str, credential, service):
199199
conn_str = conn_str.rstrip(";")
200-
conn_settings = dict(
200+
conn_settings = dict( # pylint: disable=consider-using-dict-comprehension
201201
[s.split("=", 1) for s in conn_str.split(";")]
202-
) # pylint: disable=consider-using-dict-comprehension
202+
)
203203
endpoints = _SERVICE_PARAMS[service]
204204
primary = None
205205
secondary = None

‎sdk/storage/azure-storage-queue/azure/storage/queue/_shared/downloads.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,10 @@ def download_to_stream(self, stream, max_connections=1):
465465
if max_connections > 1:
466466
import concurrent.futures
467467
executor = concurrent.futures.ThreadPoolExecutor(max_connections)
468-
list(executor.map(tracing_context.with_current_context(downloader.process_chunk), downloader.get_chunk_offsets()))
468+
list(executor.map(
469+
tracing_context.with_current_context(downloader.process_chunk),
470+
downloader.get_chunk_offsets()
471+
))
469472
else:
470473
for chunk in downloader.get_chunk_offsets():
471474
downloader.process_chunk(chunk)

‎sdk/storage/azure-storage-queue/azure/storage/queue/aio/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,5 +99,5 @@ async def _extract_data_cb(self, get_next_return):
9999
self.prefix = self._response.prefix
100100
self.marker = self._response.marker
101101
self.results_per_page = self._response.max_results
102-
103-
return self._response.next_marker or None, [QueueProperties._from_generated(q) for q in self._response.queue_items] # pylint: disable=protected-access
102+
props_list = [QueueProperties._from_generated(q) for q in self._response.queue_items] # pylint: disable=protected-access
103+
return self._response.next_marker or None, props_list

‎sdk/storage/azure-storage-queue/azure/storage/queue/aio/queue_client_async.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,4 +657,3 @@ async def delete_message(self, message, pop_receipt=None, timeout=None, **kwargs
657657
)
658658
except StorageErrorException as error:
659659
process_storage_error(error)
660-

‎sdk/storage/azure-storage-queue/azure/storage/queue/models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def _get_next_cb(self, continuation_token):
246246
except StorageErrorException as error:
247247
process_storage_error(error)
248248

249-
def _extract_data_cb(self, messages):
249+
def _extract_data_cb(self, messages): # pylint: disable=no-self-use
250250
# There is no concept of continuation token, so raising on my own condition
251251
if not messages:
252252
raise StopIteration("End of paging")
@@ -327,8 +327,8 @@ def _extract_data_cb(self, get_next_return):
327327
self.prefix = self._response.prefix
328328
self.marker = self._response.marker
329329
self.results_per_page = self._response.max_results
330-
331-
return self._response.next_marker or None, [QueueProperties._from_generated(q) for q in self._response.queue_items] # pylint: disable=protected-access
330+
props_list = [QueueProperties._from_generated(q) for q in self._response.queue_items] # pylint: disable=protected-access
331+
return self._response.next_marker or None, props_list
332332

333333

334334
class QueuePermissions(object):

‎sdk/storage/azure-storage-queue/azure/storage/queue/queue_client.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import six
1818

1919
from azure.core.paging import ItemPaged
20-
20+
from azure.core.tracing.decorator import distributed_trace
2121
from ._shared.shared_access_signature import QueueSharedAccessSignature
2222
from ._shared.base_client import StorageAccountHostsMixin, parse_connection_str, parse_query
2323
from ._shared.request_handlers import add_metadata_headers, serialize_iso
@@ -30,7 +30,6 @@
3030
from ._generated import AzureQueueStorage
3131
from ._generated.models import StorageErrorException, SignedIdentifier
3232
from ._generated.models import QueueMessage as GenQueueMessage
33-
from azure.core.tracing.decorator import distributed_trace
3433

3534
from .models import QueueMessage, AccessPolicy, MessagesPaged
3635

‎sdk/storage/azure-storage-queue/azure/storage/queue/queue_service_client.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from urlparse import urlparse # type: ignore
1515

1616
from azure.core.paging import ItemPaged
17-
17+
from azure.core.tracing.decorator import distributed_trace
1818
from ._shared.shared_access_signature import SharedAccessSignature
1919
from ._shared.models import LocationMode, Services
2020
from ._shared.base_client import StorageAccountHostsMixin, parse_connection_str, parse_query
@@ -24,7 +24,6 @@
2424

2525
from .models import QueuePropertiesPaged
2626
from .queue_client import QueueClient
27-
from azure.core.tracing.decorator import distributed_trace
2827

2928
if TYPE_CHECKING:
3029
from datetime import datetime

‎sdk/storage/azure-storage-queue/tests/test_queue.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import unittest
1010
import pytest
11+
import sys
1112
from dateutil.tz import tzutc
1213
from datetime import (
1314
datetime,
@@ -814,6 +815,7 @@ def test_unicode_create_queue_unicode_name(self):
814815
@record
815816
def test_unicode_get_messages_unicode_data(self):
816817
# Action
818+
pytest.skip("Uncomment after msrest fix")
817819
queue_client = self._create_queue()
818820
queue_client.enqueue_message(u'message1㚈')
819821
message = next(queue_client.receive_messages())
@@ -831,6 +833,7 @@ def test_unicode_get_messages_unicode_data(self):
831833
@record
832834
def test_unicode_update_message_unicode_data(self):
833835
# Action
836+
pytest.skip("Uncomment after msrest fix")
834837
queue_client = self._create_queue()
835838
queue_client.enqueue_message(u'message1')
836839
messages = queue_client.receive_messages()

0 commit comments

Comments
 (0)