Use raw string literals when backslashes are present (#2465)

Author: masci

cassandra_nodetool/datadog_checks/cassandra_nodetool/cassandra_nodetool.py

@@ -31,9 +31,9 @@
 class CassandraNodetoolCheck(AgentCheck):
 
     datacenter_name_re = re.compile('^Datacenter: (.*)')
-    node_status_re = re.compile('^(?P<status>[UD])[NLJM] +(?P<address>\d+\.\d+\.\d+\.\d+) +'
-                                '(?P<load>\d+(\.\d*)?) (?P<load_unit>(K|M|G|T)?i?B) +\d+ +'
-                                '(?P<owns>(\d+(\.\d+)?)|\?)%? +(?P<id>[a-fA-F0-9-]*) +(?P<rack>.*)')
+    node_status_re = re.compile(r'^(?P<status>[UD])[NLJM] +(?P<address>\d+\.\d+\.\d+\.\d+) +'
+                                r'(?P<load>\d+(\.\d*)?) (?P<load_unit>(K|M|G|T)?i?B) +\d+ +'
+                                r'(?P<owns>(\d+(\.\d+)?)|\?)%? +(?P<id>[a-fA-F0-9-]*) +(?P<rack>.*)')
 
     def __init__(self, name, init_config, agentConfig, instances=None):
         AgentCheck.__init__(self, name, init_config, agentConfig, instances)

ceph/datadog_checks/ceph/ceph.py

@@ -255,8 +255,8 @@ def _osd_pct_used(self, health):
             """Take a single health check string, return (OSD name, percentage used)"""
             # Full string looks like: osd.2 is full at 95%
             # Near full string: osd.1 is near full at 94%
-            pct = re.compile('\d+%').findall(health)
-            osd = re.compile('osd.\d+').findall(health)
+            pct = re.compile(r'\d+%').findall(health)
+            osd = re.compile(r'osd.\d+').findall(health)
             if len(pct) > 0 and len(osd) > 0:
                 return osd[0], int(pct[0][:-1])
             else:

cisco_aci/datadog_checks/cisco_aci/tags.py

@@ -126,7 +126,7 @@ def _tenant_mapper(self, edpt):
                 eth_list = self.api.get_eth_list_for_epg(tenant_name, app_name, epg_name)
                 for eth in eth_list:
                     eth_attrs = eth.get('fvRsCEpToPathEp', {}).get('attributes', {})
-                    port = re.search('/pathep-\[(.+?)\]', eth_attrs.get('tDn', ''))
+                    port = re.search(r'/pathep-\[(.+?)\]', eth_attrs.get('tDn', ''))
                     if not port:
                         continue
                     eth_tag = 'port:' + port.group(1)

cisco_aci/datadog_checks/cisco_aci/tenant.py

@@ -145,7 +145,7 @@ def collect_events(self, tenant, page=0, page_size=15):
         for event in event_list:
             ev = event.get('eventRecord', {}).get('attributes', {})
             created = ev.get('created')
-            create_date = re.search('\d{4}-\d{2}-\d{1,2}T\d{2}:\d{2}:\d{2}', created).group(0)
+            create_date = re.search(r'\d{4}-\d{2}-\d{1,2}T\d{2}:\d{2}:\d{2}', created).group(0)
 
             self.log.debug("ev time: {}".format(created))
             strptime = datetime.datetime.strptime(create_date, '%Y-%m-%dT%H:%M:%S')

couchbase/datadog_checks/couchbase/couchbase.py

@@ -255,7 +255,7 @@ class Couchbase(AgentCheck):
         's': 1,
     }
 
-    seconds_value_pattern = re.compile('(\d+(\.\d+)?)(\D+)')
+    seconds_value_pattern = re.compile(r'(\d+(\.\d+)?)(\D+)')
 
     class CouchbaseInstanceState(object):
         def __init__(self):
@@ -533,10 +533,10 @@ def get_data(self, server, instance):
     # Returns input if non-camelCase variable is detected.
     def camel_case_to_joined_lower(self, variable):
         # replace non-word with _
-        converted_variable = re.sub('\W+', '_', variable)
+        converted_variable = re.sub(r'\W+', '_', variable)
 
         # insert _ in front of capital letters and lowercase the string
-        converted_variable = re.sub('([A-Z])', '_\g<1>', converted_variable).lower()
+        converted_variable = re.sub('([A-Z])', r'_\g<1>', converted_variable).lower()
 
         # remove duplicate _
         converted_variable = re.sub('_+', '_', converted_variable)

datadog_checks_dev/datadog_checks/dev/tooling/e2e/docker.py

@@ -11,7 +11,7 @@
 from ...subprocess import run_command
 from ...utils import path_join
 
-MANIFEST_VERSION_PATTERN = 'agent (\d)'
+MANIFEST_VERSION_PATTERN = r'agent (\d)'
 
 
 class DockerInterface(object):

disk/datadog_checks/disk/disk.py

@@ -136,15 +136,14 @@ def collect_metrics_psutil(self):
                     self.service_check(
                         'disk.read_write',
                         AgentCheck.OK if rwro[0] == 'rw' else AgentCheck.CRITICAL,
-                        tags=tags+['device:%s' % (device_name)]
+                        tags=tags + ['device:{}'.format(device_name)]
                     )
                 else:
                     self.service_check(
                         'disk.read_write', AgentCheck.UNKNOWN,
-                        tags=tags+['device:%s' % (device_name)]
+                        tags=tags + ['device:{}'.format(device_name)]
                     )
 
-
         self.collect_latency_metrics()
 
     def _exclude_disk_psutil(self, part):
@@ -235,9 +234,9 @@ def collect_latency_metrics(self):
                 read_time_pct = disk.read_time * 100.0 / 1000.0
                 write_time_pct = disk.write_time * 100.0 / 1000.0
                 self.rate(self.METRIC_DISK.format('read_time_pct'),
-                      read_time_pct, device_name=disk_name, tags=self._custom_tags)
+                          read_time_pct, device_name=disk_name, tags=self._custom_tags)
                 self.rate(self.METRIC_DISK.format('write_time_pct'),
-                      write_time_pct, device_name=disk_name, tags=self._custom_tags)
+                          write_time_pct, device_name=disk_name, tags=self._custom_tags)
             except AttributeError as e:
                 # Some OS don't return read_time/write_time fields
                 # http://psutil.readthedocs.io/en/latest/#psutil.disk_io_counters

disk/tests/test_check.py

@@ -87,6 +87,7 @@ def aggregator():
     aggregator.reset()
     return aggregator
 
+
 @pytest.fixture(scope="module")
 def psutil_mocks():
     p1 = mock.patch('psutil.disk_partitions', return_value=[MockPart()],
@@ -104,6 +105,7 @@ def psutil_mocks():
     p3.stop()
     p4.stop()
 
+
 def test_bad_config():
     """
     Check creation will fail if more than one `instance` is passed to the
@@ -112,6 +114,7 @@ def test_bad_config():
     with pytest.raises(Exception):
         Disk('disk', None, {}, [{}, {}])
 
+
 def test_default_options():
     check = Disk('disk', None, {}, [{}])
 
@@ -124,6 +127,7 @@ def test_default_options():
     assert check._device_tag_re == []
     assert check._service_check_rw is False
 
+
 def test_disk_check(aggregator):
     """
     Basic check to see if all metrics are there
@@ -135,6 +139,7 @@ def test_disk_check(aggregator):
 
     assert aggregator.metrics_asserted_pct == 100.0
 
+
 def test__exclude_disk_psutil():
     """
     Test exclusion logic
@@ -177,6 +182,7 @@ def test__exclude_disk_psutil():
     assert c._exclude_disk_psutil(MockPart(device='sdz', mountpoint='/run')) is True
     assert c._exclude_disk_psutil(MockPart(device='sdz', mountpoint='/run/shm')) is False
 
+
 def test_device_exclusion_logic_no_name():
     """
     Same as above but with default configuration values and device='' to expose a bug in #2359
@@ -191,6 +197,7 @@ def test_device_exclusion_logic_no_name():
     assert c._exclude_disk_psutil(MockPart(device='', mountpoint='/run')) is True
     assert c._exclude_disk_psutil(MockPart(device='', mountpoint='/run/shm')) is False
 
+
 def test_psutil(aggregator, psutil_mocks):
     """
     Mock psutil and run the check
@@ -210,6 +217,7 @@ def test_psutil(aggregator, psutil_mocks):
 
     assert aggregator.metrics_asserted_pct == 100.0
 
+
 def test_use_mount(aggregator, psutil_mocks):
     """
     Same as above, using mount to tag
@@ -226,6 +234,7 @@ def test_use_mount(aggregator, psutil_mocks):
 
     assert aggregator.metrics_asserted_pct == 100.0
 
+
 def test_psutil_rw(aggregator, psutil_mocks):
     """
     Check for 'ro' option in the mounts
@@ -236,6 +245,7 @@ def test_psutil_rw(aggregator, psutil_mocks):
 
     aggregator.assert_service_check('disk.read_write', status=Disk.CRITICAL)
 
+
 def mock_df_output(fname):
     """
     Load fixtures from tests/fixtures/ folder and return a tuple matching the
@@ -244,6 +254,7 @@ def mock_df_output(fname):
     with open(os.path.join(HERE, 'fixtures', fname)) as f:
         return f.read(), '', ''
 
+
 def test_no_psutil_debian(aggregator):
     p1 = mock.patch('os.statvfs', return_value=MockInodesMetrics(), __name__="statvfs")
     p2 = mock.patch('datadog_checks.disk.disk.get_subprocess_output',
@@ -262,6 +273,7 @@ def test_no_psutil_debian(aggregator):
         aggregator.assert_metric(name, tags=['device:udev'])
     assert aggregator.metrics_asserted_pct == 100.0
 
+
 def test_no_psutil_freebsd(aggregator):
     p1 = mock.patch('os.statvfs', return_value=MockInodesMetrics(), __name__="statvfs")
     p2 = mock.patch('datadog_checks.disk.disk.get_subprocess_output',
@@ -278,6 +290,7 @@ def test_no_psutil_freebsd(aggregator):
         aggregator.assert_metric(name, value=value, tags=['device:zroot'])
     assert aggregator.metrics_asserted_pct == 100.0
 
+
 def test_no_psutil_centos(aggregator):
     p1 = mock.patch('os.statvfs', return_value=MockInodesMetrics(), __name__="statvfs")
     p2 = mock.patch('datadog_checks.disk.disk.get_subprocess_output',
@@ -295,6 +308,7 @@ def test_no_psutil_centos(aggregator):
             aggregator.assert_metric(name, tags=['device:{}'.format(device)])
     assert aggregator.metrics_asserted_pct == 100.0
 
+
 def test_legacy_option():
     """
     Ensure check option overrides datadog.conf
@@ -305,6 +319,7 @@ def test_legacy_option():
     c = Disk('disk', None, {'use_mount': 'yes'}, [{'use_mount': 'no'}])
     assert c._use_mount is False
 
+
 def test_ignore_empty_regex():
     """
     Ignore empty regex as they match all strings
@@ -313,8 +328,9 @@ def test_ignore_empty_regex():
     check = Disk('disk', None, {'device_blacklist_re': ''}, [{}])
     assert check._excluded_disk_re == re.compile('^$')
 
+
 def test_device_tagging(aggregator, psutil_mocks):
-    instances = [{'use_mount': 'no', 'device_tag_re': {"/dev/sda.*": "type:dev,tag:two"}, 'tags':["optional:tags1"]}]
+    instances = [{'use_mount': 'no', 'device_tag_re': {"/dev/sda.*": "type:dev,tag:two"}, 'tags': ["optional:tags1"]}]
     c = Disk('disk', None, {}, instances)
     c.check(instances[0])
 

disk/tox.ini

@@ -21,3 +21,8 @@ commands =
 skip_install = true
 deps = flake8
 commands = flake8 .
+
+[flake8]
+ignore = F401,F403,W504
+exclude = .eggs,.tox,build
+max-line-length = 120

go_expvar/tests/test_unit.py

@@ -238,7 +238,7 @@ def test_alias_tag_path(go_expvar_mock, check, aggregator):
         "expvar_url": common.URL_WITH_PATH,
         "metrics": [
             {
-                "path": "array/\d+/key",
+                "path": r"array/\d+/key",
                 "alias": "array.dict.key",
                 "type": "gauge",
             }