Merge pull request #491 from aws/warningsfix-2

Test

ebcli/controllers/create.py

@@ -218,7 +218,7 @@ def do_command(self):
         if (spot_max_price or on_demand_base_capacity or on_demand_above_base_capacity) and not enable_spot:
             raise InvalidOptionsError(strings['create.missing_enable_spot'])
 
-        if instance_types is "":
+        if instance_types == "":
             raise InvalidOptionsError(strings['spot.instance_types_validation'])
 
         if itype and instance_types:

ebcli/display/screen.py

@@ -439,10 +439,7 @@ def scroll_down(self, reverse=False):
         scrolled = visible_tables[0].scroll_down(reverse=reverse)
         if scrolled:
             for i in range(1, len(visible_tables)):
-                assert(
-                    len(visible_tables[0].data) >= len(visible_tables[i].data),
-                    'First table should be the largest'
-                )
+                assert len(visible_tables[0].data) >= len(visible_tables[i].data),'First table should be the largest'
                 visible_tables[i].scroll_to_id(scrolled, reverse=reverse)
 
     def scroll_over(self, reverse=False):

ebcli/lib/codebuild.py

@@ -57,7 +57,7 @@ def list_curated_environment_images():
     each available platform from CodeBuild.
     :return: array of image dictionaries
     """
-    regex_search_version = "AWS ElasticBeanstalk - (.*)v([0-9]+\.[0-9]+\.[0-9]+)"
+    regex_search_version = r"AWS ElasticBeanstalk - (.*?)v([0-9]+\.[0-9]+\.[0-9]+)"
     result = _make_api_call('list_curated_environment_images')
     beanstalk_images = []
     for platform in result['platforms']:

tests/unit/operations/tagops/test_taglist.py

@@ -134,7 +134,7 @@ def test_validate_key_value_pair__unicode_characters(self):
         Python identifies certain Unicode characters as letters, but not others.
 
         For example, the greek delta symbol is not a Unicode letter, and hence
-        will not match `\w` during regex comparisons, whereas the Swedish `a`
+        will not match `\\w` during regex comparisons, whereas the Swedish `a`
         is a letter.
 
         It is also to be noted that even if Python recognizes a Unicode character

tests/unit/operations/test_envvarops.py

@@ -30,7 +30,7 @@ def assertListsOfDictsEquivalent(self, ls1, ls2):
             Counter(frozenset(iteritems(d)) for d in ls2))
 
     def test_sanitize_environment_variables_from_customer_input(self):
-        environment_variables_input = '  """  DB_USER"""   =     "\"  r=o\"o\'t\"\"  "   ,  DB_PAS\ = SWORD="\"pass=\'\"word\""'
+        environment_variables_input = '  """  DB_USER"""   =     "\"  r=o\"o\'t\"\"  "   ,  DB_PAS\\ = SWORD="\"pass=\'\"word\""'
 
         self.assertEqual(
             [