Skip to content

Commit d9768f5

Browse files
authored
Merge pull request #19 from retr0h/correct-flake8
Changed regex to raw strings
2 parents ff5c252 + fda4985 commit d9768f5

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

giturlparse/parser.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,27 @@ def parse(self):
7171
}
7272
regexes = [
7373
(r'^(?P<protocol>https?|git|ssh|rsync)\://'
74-
'(?:(?P<user>.+)@)*'
75-
'(?P<resource>[a-z0-9_.-]*)'
76-
'[:/]*'
77-
'(?P<port>[\d]+){0,1}'
78-
'(?P<pathname>\/(?P<owner>.+)/(?P<name>.+).git)'),
74+
r'(?:(?P<user>.+)@)*'
75+
r'(?P<resource>[a-z0-9_.-]*)'
76+
r'[:/]*'
77+
r'(?P<port>[\d]+){0,1}'
78+
r'(?P<pathname>\/(?P<owner>.+)/(?P<name>.+).git)'),
7979
(r'(git\+)?'
80-
'((?P<protocol>\w+)://)'
81-
'((?P<user>\w+)@)?'
82-
'((?P<resource>[\w\.\-]+))'
83-
'(:(?P<port>\d+))?'
84-
'(?P<pathname>(\/(?P<owner>\w+)/)?'
85-
'(\/?(?P<name>[\w\-]+)(\.git)?)?)'),
80+
r'((?P<protocol>\w+)://)'
81+
r'((?P<user>\w+)@)?'
82+
r'((?P<resource>[\w\.\-]+))'
83+
r'(:(?P<port>\d+))?'
84+
r'(?P<pathname>(\/(?P<owner>\w+)/)?'
85+
r'(\/?(?P<name>[\w\-]+)(\.git)?)?)'),
8686
(r'^(?:(?P<user>.+)@)*'
87-
'(?P<resource>[a-z0-9_.-]*)[:/]*'
88-
'(?P<port>[\d]+){0,1}'
89-
'[:](?P<pathname>\/?(?P<owner>.+)/(?P<name>.+).git)'),
87+
r'(?P<resource>[a-z0-9_.-]*)[:/]*'
88+
r'(?P<port>[\d]+){0,1}'
89+
r'[:](?P<pathname>\/?(?P<owner>.+)/(?P<name>.+).git)'),
9090
(r'((?P<user>\w+)@)?'
91-
'((?P<resource>[\w\.\-]+))'
92-
'[\:\/]{1,2}'
93-
'(?P<pathname>((?P<owner>\w+)/)?'
94-
'((?P<name>[\w\-]+)(\.git)?)?)'),
91+
r'((?P<resource>[\w\.\-]+))'
92+
r'[\:\/]{1,2}'
93+
r'(?P<pathname>((?P<owner>\w+)/)?'
94+
r'((?P<name>[\w\-]+)(\.git)?)?)'),
9595
]
9696
for regex in regexes:
9797
if re.search(regex, self._url):

0 commit comments

Comments
 (0)