summaryrefslogtreecommitdiff
path: root/silx/test/test_resources.py
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>2019-05-28 08:16:16 +0200
committerPicca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>2019-05-28 08:16:16 +0200
commita763e5d1b3921b3194f3d4e94ab9de3fbe08bbdd (patch)
tree45d462ed36a5522e9f3b9fde6c4ec4918c2ae8e3 /silx/test/test_resources.py
parentcebdc9244c019224846cb8d2668080fe386a6adc (diff)
New upstream version 0.10.1+dfsg
Diffstat (limited to 'silx/test/test_resources.py')
-rw-r--r--silx/test/test_resources.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/silx/test/test_resources.py b/silx/test/test_resources.py
index 66ac24f..8d3bd41 100644
--- a/silx/test/test_resources.py
+++ b/silx/test/test_resources.py
@@ -1,7 +1,7 @@
# coding: utf-8
# /*##########################################################################
#
-# Copyright (c) 2016 European Synchrotron Radiation Facility
+# Copyright (c) 2016-2018 European Synchrotron Radiation Facility
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -32,12 +32,13 @@ __date__ = "17/01/2018"
import os
import unittest
import shutil
+import socket
import tempfile
-from silx.third_party import six
+import six
+
import silx.resources
from .utils import utilstest
-import socket
class TestResources(unittest.TestCase):