Merge lp:~adiroiban/pocket-lint/bug-906811 into lp:pocket-lint

Proposed by Adi Roiban
Status: Merged
Approved by: Curtis Hovey
Approved revision: 405
Merged at revision: 405
Proposed branch: lp:~adiroiban/pocket-lint/bug-906811
Merge into: lp:pocket-lint
Diff against target: 15 lines (+2/-0)
1 file modified
pocketlint/formatcheck.py (+2/-0)
To merge this branch: bzr merge lp:~adiroiban/pocket-lint/bug-906811
Reviewer Review Type Date Requested Status
Curtis Hovey code Approve
Review via email: mp+86371@code.launchpad.net

Description of the change

This adds support for Twisted .tac files.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you. I am merging this now.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'pocketlint/formatcheck.py'
--- pocketlint/formatcheck.py 2011-11-12 23:54:39 +0000
+++ pocketlint/formatcheck.py 2011-12-20 10:46:50 +0000
@@ -145,9 +145,11 @@
145 mimetypes.add_type('application/x-zope-configuation', '.zcml')145 mimetypes.add_type('application/x-zope-configuation', '.zcml')
146 mimetypes.add_type('application/x-zope-page-template', '.pt')146 mimetypes.add_type('application/x-zope-page-template', '.pt')
147 mimetypes.add_type('text/x-python-doctest', '.doctest')147 mimetypes.add_type('text/x-python-doctest', '.doctest')
148 mimetypes.add_type('text/x-twisted-application', '.tac')
148 mimetypes.add_type('text/x-log', '.log')149 mimetypes.add_type('text/x-log', '.log')
149 mime_type_language = {150 mime_type_language = {
150 'text/x-python': PYTHON,151 'text/x-python': PYTHON,
152 'text/x-twisted-application': PYTHON,
151 'text/x-python-doctest': DOCTEST,153 'text/x-python-doctest': DOCTEST,
152 'text/css': CSS,154 'text/css': CSS,
153 'text/html': HTML,155 'text/html': HTML,

Subscribers

People subscribed via source and target branches

to all changes: