summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves Fischer <yvesf-git@xapek.org>2016-02-07 14:13:33 +0100
committerYves Fischer <yvesf-git@xapek.org>2016-02-07 14:14:02 +0100
commit45ddf44af5a5adf5fd6f32b4844952b41fd4cb8a (patch)
tree13d6e0d31c389ce1b814f52900b622be3a435a6b
parent990a18870834be6dc0c55e19cc17f848b974757c (diff)
parentd5db9f4df0b4ad77bc5911ab0408435b3ff844d4 (diff)
downloadfuse-httpfs-45ddf44af5a5adf5fd6f32b4844952b41fd4cb8a.tar.gz
fuse-httpfs-45ddf44af5a5adf5fd6f32b4844952b41fd4cb8a.zip
Merge pull request #3 from satreix/patch-2v0.3
-rw-r--r--httpfs/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/httpfs/__init__.py b/httpfs/__init__.py
index b69c26e..1d04bd8 100644
--- a/httpfs/__init__.py
+++ b/httpfs/__init__.py
@@ -14,7 +14,7 @@ import fuse
import requests
-class Config(object):
+class Config:
mountpoint = None
timeout = None
verify = None
@@ -163,7 +163,7 @@ class Server(Directory):
elif Config.verify == "system":
self.session.verify = Config.system_ca
elif Config.verify == "none":
- logging.warn("SSL Verification disabled!")
+ logging.warning("SSL Verification disabled!")
self.session.verify = False
else:
raise SystemExit("Invalid value for ssl verification")
@@ -198,7 +198,7 @@ class Root(Directory):
class RelativeLinkCollector(HTMLParser):
def __init__(self, parent):
- super().__init__(self, convert_charrefs=True)
+ super().__init__(convert_charrefs=True)
self.parent = parent
self.entries = {}
@@ -236,7 +236,7 @@ class Httpfs(fuse.LoggingMixIn, fuse.Operations):
for machine in netrc.netrc().hosts.keys():
yield (machine, Server(parent, machine))
except IOError as e:
- logging.warn("No .netrc file found, no default machines")
+ logging.warning("No .netrc file found, no default machines")
def getattr(self, path, fh=None):
logging.debug("getattr path={}".format(path))