{"action":"created","comment":{"url":"https://api.github.com/repos/astropy/astropy/pulls/comments/34153578","id":34153578,"diff_hunk":"@@ -165,15 +195,105 @@ class DaophotData(core.BaseData):\n     start_line = 0\n     comment = r'\\s*#'\n \n+    def __init__(self):\n+        core.BaseData.__init__(self)\n+        self.is_multiline = False\n+\n+    def get_data_lines(self, lines):\n+\n+        # Special case for multiline daophot databases. Extract the aperture values from the first multiline data block\n+        if self.is_multiline:\n+            #grab the first column of the special block (aperture values) and recreate the aperture description string\n+            aplist = next( zip(*map(str.split, self.first_block)) )\n+            self.header.aperture_values = tuple(map( float, aplist ))\n+\n+        # Set self.data.data_lines to a slice of lines contain the data rows\n+        core.BaseData.get_data_lines(self, lines)\n+\n \n class DaophotInputter(core.ContinuationLinesInputter):\n-    no_continue = r'\\s*#'\n+\n+    continuation_char = '\\\\'\n+    multiline_char = '*'\n+    replace_char = ' '\n+    re_multiline     = re.compile( r'(#?)[^\\\\*#]*(\\*?)(\\\\*) ?$' )\n+\n+\n+    def search_multiline(self, lines, depth=150):\n+        '''search lines for special continuation character to determine number of continued rows in a\n+        datablock.  For efficiency, depth gives the upper limit of lines to search.'''","path":"astropy/io/ascii/daophot.py","position":320,"original_position":320,"commit_id":"e4d7f651de01a43c565aae77a7ad40f244c9d274","original_commit_id":"e4d7f651de01a43c565aae77a7ad40f244c9d274","user":{"login":"apodemus","id":5623552,"avatar_url":"https://avatars.githubusercontent.com/u/5623552?v=3","gravatar_id":"","url":"https://api.github.com/users/apodemus","html_url":"https://github.com/apodemus","followers_url":"https://api.github.com/users/apodemus/followers","following_url":"https://api.github.com/users/apodemus/following{/other_user}","gists_url":"https://api.github.com/users/apodemus/gists{/gist_id}","starred_url":"https://api.github.com/users/apodemus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apodemus/subscriptions","organizations_url":"https://api.github.com/users/apodemus/orgs","repos_url":"https://api.github.com/users/apodemus/repos","events_url":"https://api.github.com/users/apodemus/events{/privacy}","received_events_url":"https://api.github.com/users/apodemus/received_events","type":"User","site_admin":false},"body":"Instinctively, I feel like it shouldn't have too great an effect on performance to increase this value of the depth parameter.  I can do a few tests to confirm this.  The databases I dealt with are typically a few hundred thousand lines, which means the majority of the time is spent parsing the main body of the database, not the header!","created_at":"2015-07-08T14:30:17Z","updated_at":"2015-07-08T14:30:17Z","html_url":"https://github.com/astropy/astropy/pull/3535#discussion_r34153578","pull_request_url":"https://api.github.com/repos/astropy/astropy/pulls/3535","_links":{"self":{"href":"https://api.github.com/repos/astropy/astropy/pulls/comments/34153578"},"html":{"href":"https://github.com/astropy/astropy/pull/3535#discussion_r34153578"},"pull_request":{"href":"https://api.github.com/repos/astropy/astropy/pulls/3535"}}},"pull_request":{"url":"https://api.github.com/repos/astropy/astropy/pulls/3535","id":29760739,"html_url":"https://github.com/astropy/astropy/pull/3535","diff_url":"https://github.com/astropy/astropy/pull/3535.diff","patch_url":"https://github.com/astropy/astropy/pull/3535.patch","issue_url":"https://api.github.com/repos/astropy/astropy/issues/3535","number":3535,"state":"open","locked":false,"title":"Added some improvements on how multi-aperture daophot ascii databases are read","user":{"login":"apodemus","id":5623552,"avatar_url":"https://avatars.githubusercontent.com/u/5623552?v=3","gravatar_id":"","url":"https://api.github.com/users/apodemus","html_url":"https://github.com/apodemus","followers_url":"https://api.github.com/users/apodemus/followers","following_url":"https://api.github.com/users/apodemus/following{/other_user}","gists_url":"https://api.github.com/users/apodemus/gists{/gist_id}","starred_url":"https://api.github.com/users/apodemus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apodemus/subscriptions","organizations_url":"https://api.github.com/users/apodemus/orgs","repos_url":"https://api.github.com/users/apodemus/repos","events_url":"https://api.github.com/users/apodemus/events{/privacy}","received_events_url":"https://api.github.com/users/apodemus/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-02-21T21:51:09Z","updated_at":"2015-07-08T14:30:17Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8ec79d60504086abfb21fe8c0203aa9416fc0533","assignee":{"login":"taldcroft","id":348089,"avatar_url":"https://avatars.githubusercontent.com/u/348089?v=3","gravatar_id":"","url":"https://api.github.com/users/taldcroft","html_url":"https://github.com/taldcroft","followers_url":"https://api.github.com/users/taldcroft/followers","following_url":"https://api.github.com/users/taldcroft/following{/other_user}","gists_url":"https://api.github.com/users/taldcroft/gists{/gist_id}","starred_url":"https://api.github.com/users/taldcroft/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/taldcroft/subscriptions","organizations_url":"https://api.github.com/users/taldcroft/orgs","repos_url":"https://api.github.com/users/taldcroft/repos","events_url":"https://api.github.com/users/taldcroft/events{/privacy}","received_events_url":"https://api.github.com/users/taldcroft/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/astropy/astropy/pulls/3535/commits","review_comments_url":"https://api.github.com/repos/astropy/astropy/pulls/3535/comments","review_comment_url":"https://api.github.com/repos/astropy/astropy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/astropy/astropy/issues/3535/comments","statuses_url":"https://api.github.com/repos/astropy/astropy/statuses/e4d7f651de01a43c565aae77a7ad40f244c9d274","head":{"label":"apodemus:master","ref":"master","sha":"e4d7f651de01a43c565aae77a7ad40f244c9d274","user":{"login":"apodemus","id":5623552,"avatar_url":"https://avatars.githubusercontent.com/u/5623552?v=3","gravatar_id":"","url":"https://api.github.com/users/apodemus","html_url":"https://github.com/apodemus","followers_url":"https://api.github.com/users/apodemus/followers","following_url":"https://api.github.com/users/apodemus/following{/other_user}","gists_url":"https://api.github.com/users/apodemus/gists{/gist_id}","starred_url":"https://api.github.com/users/apodemus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apodemus/subscriptions","organizations_url":"https://api.github.com/users/apodemus/orgs","repos_url":"https://api.github.com/users/apodemus/repos","events_url":"https://api.github.com/users/apodemus/events{/privacy}","received_events_url":"https://api.github.com/users/apodemus/received_events","type":"User","site_admin":false},"repo":{"id":31135861,"name":"astropy","full_name":"apodemus/astropy","owner":{"login":"apodemus","id":5623552,"avatar_url":"https://avatars.githubusercontent.com/u/5623552?v=3","gravatar_id":"","url":"https://api.github.com/users/apodemus","html_url":"https://github.com/apodemus","followers_url":"https://api.github.com/users/apodemus/followers","following_url":"https://api.github.com/users/apodemus/following{/other_user}","gists_url":"https://api.github.com/users/apodemus/gists{/gist_id}","starred_url":"https://api.github.com/users/apodemus/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apodemus/subscriptions","organizations_url":"https://api.github.com/users/apodemus/orgs","repos_url":"https://api.github.com/users/apodemus/repos","events_url":"https://api.github.com/users/apodemus/events{/privacy}","received_events_url":"https://api.github.com/users/apodemus/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/apodemus/astropy","description":"Repository for the Astropy core package","fork":true,"url":"https://api.github.com/repos/apodemus/astropy","forks_url":"https://api.github.com/repos/apodemus/astropy/forks","keys_url":"https://api.github.com/repos/apodemus/astropy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/apodemus/astropy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/apodemus/astropy/teams","hooks_url":"https://api.github.com/repos/apodemus/astropy/hooks","issue_events_url":"https://api.github.com/repos/apodemus/astropy/issues/events{/number}","events_url":"https://api.github.com/repos/apodemus/astropy/events","assignees_url":"https://api.github.com/repos/apodemus/astropy/assignees{/user}","branches_url":"https://api.github.com/repos/apodemus/astropy/branches{/branch}","tags_url":"https://api.github.com/repos/apodemus/astropy/tags","blobs_url":"https://api.github.com/repos/apodemus/astropy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/apodemus/astropy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/apodemus/astropy/git/refs{/sha}","trees_url":"https://api.github.com/repos/apodemus/astropy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/apodemus/astropy/statuses/{sha}","languages_url":"https://api.github.com/repos/apodemus/astropy/languages","stargazers_url":"https://api.github.com/repos/apodemus/astropy/stargazers","contributors_url":"https://api.github.com/repos/apodemus/astropy/contributors","subscribers_url":"https://api.github.com/repos/apodemus/astropy/subscribers","subscription_url":"https://api.github.com/repos/apodemus/astropy/subscription","commits_url":"https://api.github.com/repos/apodemus/astropy/commits{/sha}","git_commits_url":"https://api.github.com/repos/apodemus/astropy/git/commits{/sha}","comments_url":"https://api.github.com/repos/apodemus/astropy/comments{/number}","issue_comment_url":"https://api.github.com/repos/apodemus/astropy/issues/comments{/number}","contents_url":"https://api.github.com/repos/apodemus/astropy/contents/{+path}","compare_url":"https://api.github.com/repos/apodemus/astropy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/apodemus/astropy/merges","archive_url":"https://api.github.com/repos/apodemus/astropy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/apodemus/astropy/downloads","issues_url":"https://api.github.com/repos/apodemus/astropy/issues{/number}","pulls_url":"https://api.github.com/repos/apodemus/astropy/pulls{/number}","milestones_url":"https://api.github.com/repos/apodemus/astropy/milestones{/number}","notifications_url":"https://api.github.com/repos/apodemus/astropy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/apodemus/astropy/labels{/name}","releases_url":"https://api.github.com/repos/apodemus/astropy/releases{/id}","created_at":"2015-02-21T18:32:22Z","updated_at":"2015-04-30T15:05:58Z","pushed_at":"2015-07-08T10:30:47Z","git_url":"git://github.com/apodemus/astropy.git","ssh_url":"git@github.com:apodemus/astropy.git","clone_url":"https://github.com/apodemus/astropy.git","svn_url":"https://github.com/apodemus/astropy","homepage":"www.astropy.org","size":37332,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"astropy:master","ref":"master","sha":"51e082426d9d26143a1c19ed14617f87b7daffb0","user":{"login":"astropy","id":847984,"avatar_url":"https://avatars.githubusercontent.com/u/847984?v=3","gravatar_id":"","url":"https://api.github.com/users/astropy","html_url":"https://github.com/astropy","followers_url":"https://api.github.com/users/astropy/followers","following_url":"https://api.github.com/users/astropy/following{/other_user}","gists_url":"https://api.github.com/users/astropy/gists{/gist_id}","starred_url":"https://api.github.com/users/astropy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/astropy/subscriptions","organizations_url":"https://api.github.com/users/astropy/orgs","repos_url":"https://api.github.com/users/astropy/repos","events_url":"https://api.github.com/users/astropy/events{/privacy}","received_events_url":"https://api.github.com/users/astropy/received_events","type":"Organization","site_admin":false},"repo":{"id":2081289,"name":"astropy","full_name":"astropy/astropy","owner":{"login":"astropy","id":847984,"avatar_url":"https://avatars.githubusercontent.com/u/847984?v=3","gravatar_id":"","url":"https://api.github.com/users/astropy","html_url":"https://github.com/astropy","followers_url":"https://api.github.com/users/astropy/followers","following_url":"https://api.github.com/users/astropy/following{/other_user}","gists_url":"https://api.github.com/users/astropy/gists{/gist_id}","starred_url":"https://api.github.com/users/astropy/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/astropy/subscriptions","organizations_url":"https://api.github.com/users/astropy/orgs","repos_url":"https://api.github.com/users/astropy/repos","events_url":"https://api.github.com/users/astropy/events{/privacy}","received_events_url":"https://api.github.com/users/astropy/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/astropy/astropy","description":"Repository for the Astropy core package","fork":false,"url":"https://api.github.com/repos/astropy/astropy","forks_url":"https://api.github.com/repos/astropy/astropy/forks","keys_url":"https://api.github.com/repos/astropy/astropy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/astropy/astropy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/astropy/astropy/teams","hooks_url":"https://api.github.com/repos/astropy/astropy/hooks","issue_events_url":"https://api.github.com/repos/astropy/astropy/issues/events{/number}","events_url":"https://api.github.com/repos/astropy/astropy/events","assignees_url":"https://api.github.com/repos/astropy/astropy/assignees{/user}","branches_url":"https://api.github.com/repos/astropy/astropy/branches{/branch}","tags_url":"https://api.github.com/repos/astropy/astropy/tags","blobs_url":"https://api.github.com/repos/astropy/astropy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/astropy/astropy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/astropy/astropy/git/refs{/sha}","trees_url":"https://api.github.com/repos/astropy/astropy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/astropy/astropy/statuses/{sha}","languages_url":"https://api.github.com/repos/astropy/astropy/languages","stargazers_url":"https://api.github.com/repos/astropy/astropy/stargazers","contributors_url":"https://api.github.com/repos/astropy/astropy/contributors","subscribers_url":"https://api.github.com/repos/astropy/astropy/subscribers","subscription_url":"https://api.github.com/repos/astropy/astropy/subscription","commits_url":"https://api.github.com/repos/astropy/astropy/commits{/sha}","git_commits_url":"https://api.github.com/repos/astropy/astropy/git/commits{/sha}","comments_url":"https://api.github.com/repos/astropy/astropy/comments{/number}","issue_comment_url":"https://api.github.com/repos/astropy/astropy/issues/comments{/number}","contents_url":"https://api.github.com/repos/astropy/astropy/contents/{+path}","compare_url":"https://api.github.com/repos/astropy/astropy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/astropy/astropy/merges","archive_url":"https://api.github.com/repos/astropy/astropy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/astropy/astropy/downloads","issues_url":"https://api.github.com/repos/astropy/astropy/issues{/number}","pulls_url":"https://api.github.com/repos/astropy/astropy/pulls{/number}","milestones_url":"https://api.github.com/repos/astropy/astropy/milestones{/number}","notifications_url":"https://api.github.com/repos/astropy/astropy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/astropy/astropy/labels{/name}","releases_url":"https://api.github.com/repos/astropy/astropy/releases{/id}","created_at":"2011-07-21T01:33:49Z","updated_at":"2015-07-08T05:21:00Z","pushed_at":"2015-07-08T14:00:52Z","git_url":"git://github.com/astropy/astropy.git","ssh_url":"git@github.com:astropy/astropy.git","clone_url":"https://github.com/astropy/astropy.git","svn_url":"https://github.com/astropy/astropy","homepage":"www.astropy.org","size":65283,"stargazers_count":600,"watchers_count":600,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":404,"mirror_url":null,"open_issues_count":563,"forks":404,"open_issues":563,"watchers":600,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/astropy/astropy/pulls/3535"},"html":{"href":"https://github.com/astropy/astropy/pull/3535"},"issue":{"href":"https://api.github.com/repos/astropy/astropy/issues/3535"},"comments":{"href":"https://api.github.com/repos/astropy/astropy/issues/3535/comments"},"review_comments":{"href":"https://api.github.com/repos/astropy/astropy/pulls/3535/comments"},"review_comment":{"href":"https://api.github.com/repos/astropy/astropy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/astropy/astropy/pulls/3535/commits"},"statuses":{"href":"https://api.github.com/repos/astropy/astropy/statuses/e4d7f651de01a43c565aae77a7ad40f244c9d274"}}}}