about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2017-01-23 19:42:40 +0100
committernfnty <git@nfnty.se>2017-01-23 19:42:40 +0100
commitd07c60e464a5e70ae8a762f828221b235ce11818 (patch)
treedbc6d2412e619196ee62f50c16b7dfbd113a86d0
parentcc358f9a9e4c3820aadea8b72ab170f2c09300b3 (diff)
downloadranger-d07c60e464a5e70ae8a762f828221b235ce11818.tar.gz
core.linemode: `FileInfoLinemode`: Output is already decoded
Fixes Python 3 crash
-rw-r--r--ranger/core/linemode.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/ranger/core/linemode.py b/ranger/core/linemode.py
index e4c6c3a4..3a29b552 100644
--- a/ranger/core/linemode.py
+++ b/ranger/core/linemode.py
@@ -5,8 +5,6 @@
 
 from __future__ import (absolute_import, division, print_function)
 
-import sys
-
 from abc import ABCMeta, abstractproperty, abstractmethod
 from datetime import datetime
 from ranger.ext.human_readable import human_readable
@@ -102,11 +100,9 @@ class FileInfoLinemode(LinemodeBase):
         if not fobj.is_directory:
             from subprocess import CalledProcessError
             try:
-                fileinfo = spawn.check_output(["file", "-bL", fobj.path]).strip()
+                fileinfo = spawn.check_output(["file", "-Lb", fobj.path]).strip()
             except CalledProcessError:
                 return "unknown"
-            if sys.version_info[0] >= 3:
-                fileinfo = fileinfo.decode("utf-8")
             return fileinfo
         else:
             raise NotImplementedError
d='n153' href='#n153'>153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388