Merge remote-tracking branch 'origin/master' into 3946-less-chatty-downloads

Dockerfile

@@ -1,10 +0,0 @@
-FROM python:2.7
-
-ADD . /tahoe-lafs
-RUN \
-  cd /tahoe-lafs && \
-  git pull --depth=100 && \
-  pip install . && \
-  rm -rf ~/.cache/
-
-WORKDIR /root

Dockerfile.dev

@@ -1,25 +0,0 @@
-FROM debian:9
-LABEL maintainer "gordon@leastauthority.com"
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq upgrade
-RUN DEBIAN_FRONTEND=noninteractive apt-get -yq install build-essential python-dev libffi-dev libssl-dev python-virtualenv git
-RUN \
-  git clone https://github.com/tahoe-lafs/tahoe-lafs.git /root/tahoe-lafs; \
-  cd /root/tahoe-lafs; \
-  virtualenv --python=python2.7 venv; \
-  ./venv/bin/pip install --upgrade setuptools; \
-  ./venv/bin/pip install --editable .; \
-  ./venv/bin/tahoe --version;
-RUN \
-  cd /root; \
-  mkdir /root/.tahoe-client; \
-  mkdir /root/.tahoe-introducer; \
-  mkdir /root/.tahoe-server;
-RUN /root/tahoe-lafs/venv/bin/tahoe create-introducer --location=tcp:introducer:3458 --port=tcp:3458 /root/.tahoe-introducer
-RUN /root/tahoe-lafs/venv/bin/tahoe start /root/.tahoe-introducer
-RUN /root/tahoe-lafs/venv/bin/tahoe create-node --location=tcp:server:3457 --port=tcp:3457 --introducer=$(cat /root/.tahoe-introducer/private/introducer.furl) /root/.tahoe-server
-RUN /root/tahoe-lafs/venv/bin/tahoe create-client --webport=3456 --introducer=$(cat /root/.tahoe-introducer/private/introducer.furl) --basedir=/root/.tahoe-client --shares-needed=1 --shares-happy=1 --shares-total=1
-VOLUME ["/root/.tahoe-client", "/root/.tahoe-server", "/root/.tahoe-introducer"]
-EXPOSE 3456 3457 3458
-ENTRYPOINT ["/root/tahoe-lafs/venv/bin/tahoe"]
-CMD []

docker-compose.yml

@@ -1,49 +0,0 @@
-version: '2'
-services:
-  client:
-    build:
-      context: .
-      dockerfile: ./Dockerfile.dev
-    volumes:
-      - ./misc:/root/tahoe-lafs/misc
-      - ./integration:/root/tahoe-lafs/integration
-      - ./src:/root/tahoe-lafs/static
-      - ./setup.cfg:/root/tahoe-lafs/setup.cfg
-      - ./setup.py:/root/tahoe-lafs/setup.py
-    ports:
-      - "127.0.0.1:3456:3456"
-    depends_on:
-      - "introducer"
-      - "server"
-    entrypoint: /root/tahoe-lafs/venv/bin/tahoe
-    command: ["run", "/root/.tahoe-client"]
-  server:
-    build:
-      context: .
-      dockerfile: ./Dockerfile.dev
-    volumes:
-      - ./misc:/root/tahoe-lafs/misc
-      - ./integration:/root/tahoe-lafs/integration
-      - ./src:/root/tahoe-lafs/static
-      - ./setup.cfg:/root/tahoe-lafs/setup.cfg
-      - ./setup.py:/root/tahoe-lafs/setup.py
-    ports:
-      - "127.0.0.1:3457:3457" 
-    depends_on: 
-      - "introducer"
-    entrypoint: /root/tahoe-lafs/venv/bin/tahoe
-    command: ["run", "/root/.tahoe-server"]
-  introducer:
-    build:
-      context: .
-      dockerfile: ./Dockerfile.dev
-    volumes:
-      - ./misc:/root/tahoe-lafs/misc
-      - ./integration:/root/tahoe-lafs/integration
-      - ./src:/root/tahoe-lafs/static
-      - ./setup.cfg:/root/tahoe-lafs/setup.cfg
-      - ./setup.py:/root/tahoe-lafs/setup.py
-    ports:
-      - "127.0.0.1:3458:3458" 
-    entrypoint: /root/tahoe-lafs/venv/bin/tahoe
-    command: ["run", "/root/.tahoe-introducer"]

newsfragments/3975.minor

@@ -0,0 +1 @@
+Fixes truthy conditional in status.py

newsfragments/3976.minor

@@ -0,0 +1 @@
+Fixes variable name same as built-in type.

src/allmydata/web/status.py

@@ -550,7 +550,7 @@ class DownloadStatusElement(Element):
             length = r_ev["length"]
             bytes_returned = r_ev["bytes_returned"]
             decrypt_time = ""
-            if bytes:
+            if bytes_returned:
                 decrypt_time = self._rate_and_time(bytes_returned, r_ev["decrypt_time"])
             speed, rtt = "",""
             if r_ev["finish_time"] is not None:
@@ -1616,30 +1616,30 @@ class StatisticsElement(Element):
     @renderer
     def uploads(self, req, tag):
         files = self._stats["counters"].get("uploader.files_uploaded", 0)
-        bytes = self._stats["counters"].get("uploader.bytes_uploaded", 0)
+        bytes_uploaded = self._stats["counters"].get("uploader.bytes_uploaded", 0)
         return tag(("%s files / %s bytes (%s)" %
-                    (files, bytes, abbreviate_size(bytes))))
+                    (files, bytes_uploaded, abbreviate_size(bytes_uploaded))))
 
     @renderer
     def downloads(self, req, tag):
         files = self._stats["counters"].get("downloader.files_downloaded", 0)
-        bytes = self._stats["counters"].get("downloader.bytes_downloaded", 0)
+        bytes_uploaded = self._stats["counters"].get("downloader.bytes_downloaded", 0)
         return tag("%s files / %s bytes (%s)" %
-                   (files, bytes, abbreviate_size(bytes)))
+                   (files, bytes_uploaded, abbreviate_size(bytes_uploaded)))
 
     @renderer
     def publishes(self, req, tag):
         files = self._stats["counters"].get("mutable.files_published", 0)
-        bytes = self._stats["counters"].get("mutable.bytes_published", 0)
-        return tag("%s files / %s bytes (%s)" % (files, bytes,
-                                                 abbreviate_size(bytes)))
+        bytes_uploaded = self._stats["counters"].get("mutable.bytes_published", 0)
+        return tag("%s files / %s bytes (%s)" % (files, bytes_uploaded,
+                                                 abbreviate_size(bytes_uploaded)))
 
     @renderer
     def retrieves(self, req, tag):
         files = self._stats["counters"].get("mutable.files_retrieved", 0)
-        bytes = self._stats["counters"].get("mutable.bytes_retrieved", 0)
-        return tag("%s files / %s bytes (%s)" % (files, bytes,
-                                                 abbreviate_size(bytes)))
+        bytes_uploaded = self._stats["counters"].get("mutable.bytes_retrieved", 0)
+        return tag("%s files / %s bytes (%s)" % (files, bytes_uploaded,
+                                                 abbreviate_size(bytes_uploaded)))
 
     @renderer
     def raw(self, req, tag):