You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/12/13 18:28:15 UTC
[1/3] git commit: [#6922] ticket:501 Fix a couple of AttributeErrors
on None
Updated Branches:
refs/heads/master b988a938c -> fac4ad7a2
[#6922] ticket:501 Fix a couple of AttributeErrors on None
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/989c0536
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/989c0536
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/989c0536
Branch: refs/heads/master
Commit: 989c053668e37b643d431b9e3fe9a35c3fdc3715
Parents: 42e29a3
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Dec 12 11:54:26 2013 +0000
Committer: Cory Johns <ad...@users.sf.net>
Committed: Thu Dec 12 20:48:09 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/github/tracker.py | 2 +-
ForgeImporters/forgeimporters/github/utils.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/989c0536/ForgeImporters/forgeimporters/github/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py
index 97ea16b..d63becf 100644
--- a/ForgeImporters/forgeimporters/github/tracker.py
+++ b/ForgeImporters/forgeimporters/github/tracker.py
@@ -235,7 +235,7 @@ class GitHubTrackerImporter(ToolImporter):
for milestone in self.open_milestones:
global_milestones['milestones'].append({
'name': milestone[0],
- 'due_date': unicode(milestone[1].date()),
+ 'due_date': unicode(milestone[1].date()) if milestone[1] else None,
'complete': False,
})
return [global_milestones]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/989c0536/ForgeImporters/forgeimporters/github/utils.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/utils.py b/ForgeImporters/forgeimporters/github/utils.py
index ec3d5ff..0fb650b 100644
--- a/ForgeImporters/forgeimporters/github/utils.py
+++ b/ForgeImporters/forgeimporters/github/utils.py
@@ -26,6 +26,8 @@ class GitHubMarkdownConverter(object):
self.code_patterns = ['```', '~~~']
def convert(self, text):
+ if text is None:
+ return ''
lines = self._parse_lines(text.split('\n'))
return '\n'.join(lines)
[2/3] git commit: [#6922] ticket:501 Fixed freeze when importing
issue tracker
Posted by jo...@apache.org.
[#6922] ticket:501 Fixed freeze when importing issue tracker
Chenged regexp to match image URL
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/42e29a31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/42e29a31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/42e29a31
Branch: refs/heads/master
Commit: 42e29a316cc958d372ee587e74684cea8b7162eb
Parents: b988a93
Author: Andriy Sherepa <as...@gmail.com>
Authored: Wed Dec 11 10:39:08 2013 +0200
Committer: Cory Johns <ad...@users.sf.net>
Committed: Thu Dec 12 20:48:09 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/github/tracker.py | 2 +-
ForgeImporters/forgeimporters/tests/github/test_tracker.py | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/42e29a31/ForgeImporters/forgeimporters/github/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py
index cda1466..97ea16b 100644
--- a/ForgeImporters/forgeimporters/github/tracker.py
+++ b/ForgeImporters/forgeimporters/github/tracker.py
@@ -245,7 +245,7 @@ class GitHubTrackerImporter(ToolImporter):
# usual syntax is
# \r\n
REGEXP = r'!\[[\w0-9]+?\]\(((?:https?:\/\/)?[\da-z\.-]+\.[a-z\.]{2,6}'\
- '(?:[\/\w\.-]+)*.(jpg|jpeg|png|gif))\)\r\n'
+ '(?:[\/%\w\.-]+)*.(jpg|jpeg|png|gif))\)(\r\n){0,1}'
attachments = []
try:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/42e29a31/ForgeImporters/forgeimporters/tests/github/test_tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/tests/github/test_tracker.py b/ForgeImporters/forgeimporters/tests/github/test_tracker.py
index e3da3c7..9679c6b 100644
--- a/ForgeImporters/forgeimporters/tests/github/test_tracker.py
+++ b/ForgeImporters/forgeimporters/tests/github/test_tracker.py
@@ -117,11 +117,13 @@ class TestTrackerImporter(TestCase):
def test_get_attachments(self):
importer = tracker.GitHubTrackerImporter()
body = 'hello\n' \
- '\r\n'
+ '\r\n' \
+ ''
new_body, attachments = importer._get_attachments(body)
self.assertEqual(new_body, 'hello\n')
- self.assertEqual(len(attachments), 1)
+ self.assertEqual(len(attachments), 2)
self.assertEqual(attachments[0].url, 'https://f.cloud.github.com/assets/979771/1027411/a393ab5e-0e70-11e3-8a38-b93a3df904cf.jpg')
+ self.assertEqual(attachments[1].url, 'http://f.cl.ly/items/13453x43053r2G0d3x0v/Screen%20Shot%202012-04-28%20at%2010.48.17%20AM.png')
def test_process_comments(self):
ticket = mock.Mock()
[3/3] git commit: [#6922] Regexp cleanup to prevent freeze on any
other unmatched chars
Posted by jo...@apache.org.
[#6922] Regexp cleanup to prevent freeze on any other unmatched chars
The ([...]+)* construct was causing the regexp parser to hang when the
[...] block didn't match. [42e29a] fixed the proximate cause of the
freezes (filenames including % chars), but that construct was weird
and pointless anyway.
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/fac4ad7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/fac4ad7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/fac4ad7a
Branch: refs/heads/master
Commit: fac4ad7a2f9d91a3c4c83d43296aa382162f3185
Parents: 989c053
Author: Cory Johns <ad...@users.sf.net>
Authored: Fri Dec 13 17:22:47 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Fri Dec 13 17:26:38 2013 +0000
----------------------------------------------------------------------
ForgeImporters/forgeimporters/github/tracker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/fac4ad7a/ForgeImporters/forgeimporters/github/tracker.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/forgeimporters/github/tracker.py b/ForgeImporters/forgeimporters/github/tracker.py
index d63becf..31ed344 100644
--- a/ForgeImporters/forgeimporters/github/tracker.py
+++ b/ForgeImporters/forgeimporters/github/tracker.py
@@ -245,7 +245,7 @@ class GitHubTrackerImporter(ToolImporter):
# usual syntax is
# \r\n
REGEXP = r'!\[[\w0-9]+?\]\(((?:https?:\/\/)?[\da-z\.-]+\.[a-z\.]{2,6}'\
- '(?:[\/%\w\.-]+)*.(jpg|jpeg|png|gif))\)(\r\n){0,1}'
+ '[\/%\w\.-]*.(jpg|jpeg|png|gif))\)[\r\n]*'
attachments = []
try: