Commit 5007ecbb00fdd521886d6a857ccc7830c26278d2
1 parent
a052ca0a
Exists in
master
and in
5 other branches
FIX: Fix problem unicode
Showing
2 changed files
with
5 additions
and
7 deletions
Show diff stats
invesalius/reader/dicom.py
@@ -1926,12 +1926,7 @@ class Image(object): | @@ -1926,12 +1926,7 @@ class Image(object): | ||
1926 | self.number = parser.GetImageNumber() | 1926 | self.number = parser.GetImageNumber() |
1927 | self.spacing = spacing = parser.GetPixelSpacing() | 1927 | self.spacing = spacing = parser.GetPixelSpacing() |
1928 | self.orientation_label = parser.GetImageOrientationLabel() | 1928 | self.orientation_label = parser.GetImageOrientationLabel() |
1929 | - | ||
1930 | - if (sys.platform == 'win32'): | ||
1931 | - self.file = parser.filename.encode(utils.get_system_encoding()) | ||
1932 | - else: | ||
1933 | - self.file = parser.filename.encode('utf-8') | ||
1934 | - | 1929 | + self.file = parser.filename |
1935 | self.time = parser.GetImageTime() | 1930 | self.time = parser.GetImageTime() |
1936 | self.type = parser.GetImageType() | 1931 | self.type = parser.GetImageType() |
1937 | self.size = (parser.GetDimensionX(), parser.GetDimensionY()) | 1932 | self.size = (parser.GetDimensionX(), parser.GetDimensionY()) |
invesalius/utils.py
@@ -254,4 +254,7 @@ def get_physical_memory(): | @@ -254,4 +254,7 @@ def get_physical_memory(): | ||
254 | 254 | ||
255 | 255 | ||
256 | def get_system_encoding(): | 256 | def get_system_encoding(): |
257 | - return locale.getdefaultlocale()[1] | 257 | + if (sys.platform == 'win32'): |
258 | + return locale.getdefaultlocale()[1] | ||
259 | + else: | ||
260 | + return 'utf-8' |