Merge pull request #284 from tongwang/master

chrismattmann · web-flow · commit cf3327104a34 · 2020-03-02T11:15:13.000-08:00
fix bug: non-ascii file name not supported in detect type
diff --git a/tika/tika.py b/tika/tika.py
@@ -476,7 +476,7 @@ def detectType1(option, urlOrPath, serverEndpoint=ServerEndpoint, verbose=Verbos
     status, response = callServer('put', serverEndpoint, service, open(path, 'rb'),
             {
                 'Accept': responseMimeType,
-                'Content-Disposition': make_content_disposition_header(path)
+                'Content-Disposition': make_content_disposition_header(path.encode('utf-8') if type(path) is unicode_string else path)
             },
             verbose, tikaServerJar, config_path=config_path, requestOptions=requestOptions)
     if csvOutput == 1:

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ def detectType1(option, urlOrPath, serverEndpoint=ServerEndpoint, verbose=Verbos`
`476`	`476`	`status, response = callServer('put', serverEndpoint, service, open(path, 'rb'),`
`477`	`477`	`{`
`478`	`478`	`'Accept': responseMimeType,`
`479`		`- 'Content-Disposition': make_content_disposition_header(path)`
	`479`	`+ 'Content-Disposition': make_content_disposition_header(path.encode('utf-8') if type(path) is unicode_string else path)`
`480`	`480`	`},`
`481`	`481`	`verbose, tikaServerJar, config_path=config_path, requestOptions=requestOptions)`
`482`	`482`	`if csvOutput == 1:`