Show More
@@ -315,18 +315,8 b' class FileNode(Node):' | |||||
315 |
|
315 | |||
316 | def get_mimetype(self): |
|
316 | def get_mimetype(self): | |
317 | """ |
|
317 | """ | |
318 |
Mimetype is calculated based on the file's content. |
|
318 | Mimetype is calculated based on the file's content. | |
319 | attribute is available, it will be returned (backends which store |
|
|||
320 | mimetypes or can easily recognize them, should set this private |
|
|||
321 | attribute to indicate that type should *NOT* be calculated). |
|
|||
322 | """ |
|
319 | """ | |
323 | if hasattr(self, '_mimetype'): |
|
|||
324 | if (isinstance(self._mimetype, (tuple, list,)) and |
|
|||
325 | len(self._mimetype) == 2): |
|
|||
326 | return self._mimetype |
|
|||
327 | else: |
|
|||
328 | raise NodeError('given _mimetype attribute must be an 2 ' |
|
|||
329 | 'element list or tuple') |
|
|||
330 |
|
320 | |||
331 | mtype, encoding = mimetypes.guess_type(self.name) |
|
321 | mtype, encoding = mimetypes.guess_type(self.name) | |
332 |
|
322 |
@@ -152,13 +152,11 b' class NodeBasicTest(unittest.TestCase):' | |||||
152 | py_node = FileNode('test.py') |
|
152 | py_node = FileNode('test.py') | |
153 | tar_node = FileNode('test.tar.gz') |
|
153 | tar_node = FileNode('test.tar.gz') | |
154 |
|
154 | |||
155 | ext = 'CustomExtension' |
|
|||
156 |
|
||||
157 | my_node2 = FileNode('myfile2') |
|
155 | my_node2 = FileNode('myfile2') | |
158 |
my_node2._ |
|
156 | my_node2._content = 'foobar' | |
159 |
|
157 | |||
160 | my_node3 = FileNode('myfile3') |
|
158 | my_node3 = FileNode('myfile3') | |
161 |
my_node3._ |
|
159 | my_node3._content = '\0foobar' | |
162 |
|
160 | |||
163 | self.assertEqual(py_node.mimetype, mimetypes.guess_type(py_node.name)[0]) |
|
161 | self.assertEqual(py_node.mimetype, mimetypes.guess_type(py_node.name)[0]) | |
164 | self.assertEqual(py_node.get_mimetype(), mimetypes.guess_type(py_node.name)) |
|
162 | self.assertEqual(py_node.get_mimetype(), mimetypes.guess_type(py_node.name)) | |
@@ -166,10 +164,11 b' class NodeBasicTest(unittest.TestCase):' | |||||
166 | self.assertEqual(tar_node.mimetype, mimetypes.guess_type(tar_node.name)[0]) |
|
164 | self.assertEqual(tar_node.mimetype, mimetypes.guess_type(tar_node.name)[0]) | |
167 | self.assertEqual(tar_node.get_mimetype(), mimetypes.guess_type(tar_node.name)) |
|
165 | self.assertEqual(tar_node.get_mimetype(), mimetypes.guess_type(tar_node.name)) | |
168 |
|
166 | |||
169 |
self.assert |
|
167 | self.assertEqual(my_node2.mimetype, 'text/plain') | |
|
168 | self.assertEqual(my_node2.get_mimetype(), ('text/plain', None)) | |||
170 |
|
169 | |||
171 |
self.assertEqual(my_node3.mimetype, |
|
170 | self.assertEqual(my_node3.mimetype, 'application/octet-stream') | |
172 |
self.assertEqual(my_node3.get_mimetype(), |
|
171 | self.assertEqual(my_node3.get_mimetype(), ('application/octet-stream', None)) | |
173 |
|
172 | |||
174 | class NodeContentTest(unittest.TestCase): |
|
173 | class NodeContentTest(unittest.TestCase): | |
175 |
|
174 |
General Comments 0
You need to be logged in to leave comments.
Login now