Globbing.py: Convert glob '*' to '**' #5114

ishanSrt · 2018-01-26T14:12:56Z

Some bears' result.origin have os.sep in them which makes
the glob * not match against them. This commit removes the
implementation of this glob altogether and converts it into **.

Closes #5041

gitmate-bot · 2018-01-26T14:16:15Z

coalib/processes/Processing.py

@@ -138,6 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
+                print("SAY WHAT?")


You do not use the preferred quotation marks.

Origin: QuotesBear, Section: python.

The issue can be fixed by applying the following patch:

--- a/tmp/tmp3so0n3am/coalib/processes/Processing.py +++ b/tmp/tmp3so0n3am/coalib/processes/Processing.py @@ -138,7 +138,7 @@ action = default_actions[result.origin] except KeyError: for bear_glob in default_actions: - print("SAY WHAT?") + print('SAY WHAT?') print("bear_glob:", bear_glob) if fnmatch(result.origin, bear_glob): action = default_actions[bear_glob]

gitmate-bot · 2018-01-26T14:16:16Z

coalib/processes/Processing.py

@@ -138,6 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
+                print("SAY WHAT?")
+                print("bear_glob:", bear_glob)


You do not use the preferred quotation marks.

Origin: QuotesBear, Section: python.

The issue can be fixed by applying the following patch:

--- a/tmp/tmp3so0n3am/coalib/processes/Processing.py +++ b/tmp/tmp3so0n3am/coalib/processes/Processing.py @@ -139,7 +139,7 @@ except KeyError: for bear_glob in default_actions: print("SAY WHAT?") - print("bear_glob:", bear_glob) + print('bear_glob:', bear_glob) if fnmatch(result.origin, bear_glob): action = default_actions[bear_glob] break

gitmate-bot · 2018-01-26T14:16:17Z

coalib/collecting/Collectors.py

@@ -170,6 +171,8 @@ def collect_bears(bear_dirs, bear_globs, kinds, log_printer=None,
    :return:                    Tuple of list of matching bear classes based on
                                kind. The lists are in the same order as kinds.
    """
+    print("BEAR_GLOBS:", bear_globs)


You do not use the preferred quotation marks.

Origin: QuotesBear, Section: python.

The issue can be fixed by applying the following patch:

--- a/tmp/tmp3so0n3am/coalib/collecting/Collectors.py +++ b/tmp/tmp3so0n3am/coalib/collecting/Collectors.py @@ -171,7 +171,7 @@ :return: Tuple of list of matching bear classes based on kind. The lists are in the same order as kinds. """ - print("BEAR_GLOBS:", bear_globs) + print('BEAR_GLOBS:', bear_globs) print("WHEEEEEEEEE!!!!!") bears_found = tuple([] for i in range(len(kinds))) bear_globs_with_bears = set()

gitmate-bot · 2018-01-26T14:16:18Z

coalib/collecting/Collectors.py

@@ -170,6 +171,8 @@ def collect_bears(bear_dirs, bear_globs, kinds, log_printer=None,
    :return:                    Tuple of list of matching bear classes based on
                                kind. The lists are in the same order as kinds.
    """
+    print("BEAR_GLOBS:", bear_globs)
+    print("WHEEEEEEEEE!!!!!")


You do not use the preferred quotation marks.

Origin: QuotesBear, Section: python.

The issue can be fixed by applying the following patch:

--- a/tmp/tmp3so0n3am/coalib/collecting/Collectors.py +++ b/tmp/tmp3so0n3am/coalib/collecting/Collectors.py @@ -172,7 +172,7 @@ kind. The lists are in the same order as kinds. """ print("BEAR_GLOBS:", bear_globs) - print("WHEEEEEEEEE!!!!!") + print('WHEEEEEEEEE!!!!!') bears_found = tuple([] for i in range(len(kinds))) bear_globs_with_bears = set() for bear, glob in icollect_bears(bear_dirs, bear_globs, kinds):

gitmate-bot · 2018-01-26T14:18:00Z

Comment on 4a436f1.

No newline found between shortlog and body at HEAD commit. Please add one.

Origin: GitCommitBear, Section: commit.

pareksha · 2018-01-26T16:07:45Z

coalib/parsing/Globbing.py

@@ -212,9 +212,12 @@ def fnmatch(name, globs):
                        More than two or just one sequence can be given.
    -  '?':             Matches any single character.
    -  '*':             Matches everything but os.sep.
+                        [NOTE: Not implementing this anymore,
+                        converting it internally into '**']


Could you change it to '*' to be more precise?

pareksha · 2018-01-26T16:10:56Z

tests/parsing/GlobbingTest.py

-        matches = ['axb', 'ayb']
-        non_matches = ['aXbX', os.path.join('a', 'b')]
+        matches = ['axb', 'ayb', os.path.join('a', 'b')]
+        non_matches = ['aXbX']


Why do you have to change the position of os.path.join('a', 'b') from non_matches to matches?

the commit body explains that

newbazz · 2018-01-26T19:46:38Z

tests/parsing/GlobbingTest.py

-        matches = ['axb', 'ayb']
-        non_matches = ['aXbX', os.path.join('a', 'b')]
+        matches = ['axb', 'ayb', os.path.join('a', 'b')]
+        non_matches = ['aXbX']


Then how will pattern a**b and a*b ?

I don't understand what you mean by that question

newbazz

wont a**b change to a****b?

ishanSrt · 2018-01-27T04:30:19Z

@newbazz that won't make any difference while comparing globs

ishanSrt · 2018-01-27T10:45:47Z

wont a**b change to a****b?

I am thinking to change that behaviour anyways

newbazz · 2018-01-27T11:15:33Z

Why any loop hole?

ishanSrt · 2018-01-28T04:06:34Z

@newbazz 😆😂 this isn't a "loophole" at all since the behaviour won't change at all.

gitmate-bot · 2018-01-28T04:21:38Z

coalib/parsing/Globbing.py

    -  '**':            Matches everything.
    """
    globs = (globs,) if isinstance(globs, str) else tuple(globs)
+    globs = tuple([glob.replace('*', '**') for glob in globs
+                   if glob=='*'])


The code does not comply to PEP8.

Origin: PEP8Bear, Section: autopep8.

The issue can be fixed by applying the following patch:

--- a/tmp/tmp045hi3_o/coalib/parsing/Globbing.py +++ b/tmp/tmp045hi3_o/coalib/parsing/Globbing.py @@ -218,7 +218,7 @@ """ globs = (globs,) if isinstance(globs, str) else tuple(globs) globs = tuple([glob.replace('*', '**') for glob in globs - if glob=='*']) + if glob == '*']) if len(globs) == 0: return True

gitmate-bot · 2018-01-28T04:21:39Z

coalib/parsing/Globbing.py

    -  '**':            Matches everything.
    """
    globs = (globs,) if isinstance(globs, str) else tuple(globs)
+    globs = tuple([glob.replace('*', '**') for glob in globs
+                   if glob=='*'])


E225 missing whitespace around operator

Origin: PycodestyleBear (E225), Section: autopep8.

ishanSrt · 2018-01-28T04:27:07Z

The glob ** means 0 to any number of any characters so two of them also mean the same. Anyways I made the changes.

gitmate-bot · 2018-01-28T15:06:11Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                  if bear_glob=='*' else bear_glob):


The code does not comply to PEP8.

Origin: PEP8Bear, Section: autopep8.

The issue can be fixed by applying the following patch:

--- a/tmp/tmpyc35g06a/coalib/processes/Processing.py +++ b/tmp/tmpyc35g06a/coalib/processes/Processing.py @@ -139,7 +139,7 @@ except KeyError: for bear_glob in default_actions: if fnmatch(result.origin, bear_glob.replace('*', '**') - if bear_glob=='*' else bear_glob): + if bear_glob == '*' else bear_glob): action = default_actions[bear_glob] break else:

gitmate-bot · 2018-01-28T15:06:12Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                  if bear_glob=='*' else bear_glob):


E128 continuation line under-indented for visual indent

Origin: PycodestyleBear (E128), Section: autopep8.

gitmate-bot · 2018-01-28T15:06:12Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                  if bear_glob=='*' else bear_glob):


E225 missing whitespace around operator

Origin: PycodestyleBear (E225), Section: autopep8.

gitmate-bot · 2018-01-28T15:07:41Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                  if bear_glob=='*' else bear_glob):


The code does not comply to PEP8.

Origin: PEP8Bear, Section: autopep8.

The issue can be fixed by applying the following patch:

--- a/tmp/tmpf_4_v7mu/coalib/processes/Processing.py +++ b/tmp/tmpf_4_v7mu/coalib/processes/Processing.py @@ -139,7 +139,7 @@ except KeyError: for bear_glob in default_actions: if fnmatch(result.origin, bear_glob.replace('*', '**') - if bear_glob=='*' else bear_glob): + if bear_glob == '*' else bear_glob): action = default_actions[bear_glob] break else:

gitmate-bot · 2018-01-28T15:07:42Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                  if bear_glob=='*' else bear_glob):


E128 continuation line under-indented for visual indent

Origin: PycodestyleBear (E128), Section: autopep8.

gitmate-bot · 2018-01-28T15:07:43Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                  if bear_glob=='*' else bear_glob):


E225 missing whitespace around operator

Origin: PycodestyleBear (E225), Section: autopep8.

gitmate-bot · 2018-01-28T15:08:47Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                      if bear_glob=='*' else bear_glob):


The code does not comply to PEP8.

Origin: PEP8Bear, Section: autopep8.

The issue can be fixed by applying the following patch:

--- a/tmp/tmp11trd8u9/coalib/processes/Processing.py +++ b/tmp/tmp11trd8u9/coalib/processes/Processing.py @@ -139,7 +139,7 @@ except KeyError: for bear_glob in default_actions: if fnmatch(result.origin, bear_glob.replace('*', '**') - if bear_glob=='*' else bear_glob): + if bear_glob == '*' else bear_glob): action = default_actions[bear_glob] break else:

gitmate-bot · 2018-01-28T15:08:48Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                      if bear_glob=='*' else bear_glob):


E128 continuation line under-indented for visual indent

Origin: PycodestyleBear (E128), Section: autopep8.

gitmate-bot · 2018-01-28T15:08:49Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                      if bear_glob=='*' else bear_glob):


E225 missing whitespace around operator

Origin: PycodestyleBear (E225), Section: autopep8.

gitmate-bot · 2018-01-28T15:10:04Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                        if bear_glob=='*' else bear_glob):


The code does not comply to PEP8.

Origin: PEP8Bear, Section: autopep8.

The issue can be fixed by applying the following patch:

--- a/tmp/tmpvjqbzma8/coalib/processes/Processing.py +++ b/tmp/tmpvjqbzma8/coalib/processes/Processing.py @@ -139,7 +139,7 @@ except KeyError: for bear_glob in default_actions: if fnmatch(result.origin, bear_glob.replace('*', '**') - if bear_glob=='*' else bear_glob): + if bear_glob == '*' else bear_glob): action = default_actions[bear_glob] break else:

gitmate-bot · 2018-01-28T15:10:05Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                        if bear_glob=='*' else bear_glob):


E128 continuation line under-indented for visual indent

Origin: PycodestyleBear (E128), Section: autopep8.

gitmate-bot · 2018-01-28T15:10:06Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                        if bear_glob=='*' else bear_glob):


E225 missing whitespace around operator

Origin: PycodestyleBear (E225), Section: autopep8.

gitmate-bot · 2018-01-28T15:11:44Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                           if bear_glob=='*' else bear_glob):


The code does not comply to PEP8.

Origin: PEP8Bear, Section: autopep8.

The issue can be fixed by applying the following patch:

--- a/tmp/tmpm_rvtf_q/coalib/processes/Processing.py +++ b/tmp/tmpm_rvtf_q/coalib/processes/Processing.py @@ -139,7 +139,7 @@ except KeyError: for bear_glob in default_actions: if fnmatch(result.origin, bear_glob.replace('*', '**') - if bear_glob=='*' else bear_glob): + if bear_glob == '*' else bear_glob): action = default_actions[bear_glob] break else:

gitmate-bot · 2018-01-28T15:11:44Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                           if bear_glob=='*' else bear_glob):


E225 missing whitespace around operator

Origin: PycodestyleBear (E225), Section: autopep8.

newbazz · 2018-01-28T17:09:14Z

coalib/processes/Processing.py

@@ -138,7 +138,8 @@ def autoapply_actions(results,
            action = default_actions[result.origin]
        except KeyError:
            for bear_glob in default_actions:
-                if fnmatch(result.origin, bear_glob):
+                if fnmatch(result.origin, bear_glob.replace('*', '**')
+                           if bear_glob == '*' else bear_glob):


Sudnt this be if not "**" in bear_globs then replace '*' with '**' ?

@newbazz wip. Please review only after I ping you😉

actually the solution is not simple as that, I have to check for each * I find whether the next is also not a * and only then I need to convert that. I am trying to find an elegant one liner for that. Also need to write a test over here.

That is what i am telling bro, if ** not in x and '*' in x then replace but then there can be something like a*b**c right?

yes and I don't want to write an ugly loop

yeah exactly!! :)

You could also use re.subs(r'\*[^*]', '**', text)

Ah maybe the regex has to be expanded to

\*([^*]|$)

@Makman2 that is still gonna match the last * in any number of consecutive *s

Some bears' ``result.origin`` have ``os.sep`` in them which makes the glob ``*`` not match against them. This commit removes the implementation of this glob altogether while comparing globs with bear names and converts it into ``**``. Closes coala#5041

jayvdb

Needs tests

gitmate-bot added process/pending review size/XS area/config difficulty/low status/needs discussion labels Jan 26, 2018

gitmate-bot assigned ishanSrt Jan 26, 2018

ishanSrt force-pushed the globglob branch from 6ff653c to 31a9da3 Compare January 26, 2018 14:15

gitmate-bot reviewed Jan 26, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from 31a9da3 to 4a436f1 Compare January 26, 2018 14:17

ishanSrt force-pushed the globglob branch 3 times, most recently from 993beb5 to 09aba61 Compare January 26, 2018 14:32

pareksha reviewed Jan 26, 2018

View reviewed changes

pareksha suggested changes Jan 26, 2018

View reviewed changes

newbazz reviewed Jan 26, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from 09aba61 to a623429 Compare January 28, 2018 04:21

gitmate-bot reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch 2 times, most recently from 319d6d9 to bfe4a5a Compare January 28, 2018 04:24

gitmate-bot reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from 809b96e to 5f498df Compare January 28, 2018 15:07

gitmate-bot reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from 5f498df to beb5bb7 Compare January 28, 2018 15:08

gitmate-bot reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from beb5bb7 to 0c32e06 Compare January 28, 2018 15:09

gitmate-bot reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from 0c32e06 to d2d5a57 Compare January 28, 2018 15:11

gitmate-bot reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch from d2d5a57 to f9dfc1a Compare January 28, 2018 15:12

newbazz reviewed Jan 28, 2018

View reviewed changes

ishanSrt force-pushed the globglob branch 2 times, most recently from 623179e to 4d1b5de Compare March 13, 2018 13:38

gitmate-bot added the status/stale label Mar 18, 2018

ishanSrt force-pushed the globglob branch from 4d1b5de to 6617dd6 Compare March 29, 2018 17:24

ishanSrt force-pushed the globglob branch from 6617dd6 to 7475c4a Compare March 29, 2018 18:29

gitmate-bot removed the status/stale label Mar 30, 2018

jayvdb requested changes Apr 30, 2018

View reviewed changes

jayvdb added process/wip and removed process/pending review labels Apr 30, 2018

Globbing.py: Convert glob '*' to '**' #5114

Are you sure you want to change the base?

Globbing.py: Convert glob '*' to '**' #5114

Conversation

ishanSrt commented Jan 26, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gitmate-bot commented Jan 26, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

newbazz left a comment

Choose a reason for hiding this comment

ishanSrt commented Jan 27, 2018

ishanSrt commented Jan 27, 2018

newbazz commented Jan 27, 2018

ishanSrt commented Jan 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ishanSrt commented Jan 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ishanSrt Jan 29, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jayvdb left a comment

Choose a reason for hiding this comment

ishanSrt commented Jan 26, 2018 •

edited

ishanSrt Jan 29, 2018 •

edited