aboutsummaryrefslogtreecommitdiff
path: root/cgi
diff options
context:
space:
mode:
authorLibravatar z411 2019-04-01 16:52:42 -0300
committerLibravatar z411 2019-04-01 18:21:56 -0300
commit770acfd68a6c4cbf2e62bb9b129b8ccc446f01ab (patch)
tree55727c5694bd85c65b8a4d7a9da4e38f9f0f410b /cgi
parentff6bf1b045fa810989a3efc78624123d3fc97f19 (diff)
downloadweabot-770acfd68a6c4cbf2e62bb9b129b8ccc446f01ab.tar.gz
weabot-770acfd68a6c4cbf2e62bb9b129b8ccc446f01ab.tar.xz
weabot-770acfd68a6c4cbf2e62bb9b129b8ccc446f01ab.zip
oekaki: Usando os.path.join
PS: En realidad esta es la forma correcta de trabajar con directorios en Python. Lo ideal sería corregir la aplicación completa para que se utilice (en vez de concats ordinarios) y quitar el trailing slash desde los directorios en la configuración.
Diffstat (limited to 'cgi')
-rw-r--r--cgi/oekaki.py6
-rwxr-xr-xcgi/weabot.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/cgi/oekaki.py b/cgi/oekaki.py
index 14c3a1d..e20316c 100644
--- a/cgi/oekaki.py
+++ b/cgi/oekaki.py
@@ -116,7 +116,7 @@ def oekaki(self, path_split):
board = setBoard(path_split[3])
ip = inet_aton(self.environ["REMOTE_ADDR"])
- fname = "%s/%s/temp/%d.png" % (Settings.IMAGES_DIR, board['dir'], ip)
+ fname = os.path.join(Settings.IMAGES_DIR, board['dir'], "temp", str(ip) + ".png")
if path_split[4] == 'b64':
page = write_from_base64(fname, self.formdata['image'])
@@ -139,7 +139,7 @@ def oekaki(self, path_split):
ts = int(time.time())
ip = inet_aton(self.environ["REMOTE_ADDR"])
- fname = "%s/%s/temp/%d.png" % (Settings.IMAGES_DIR, board['dir'], ip)
+ fname = os.path.join(Settings.IMAGES_DIR, board['dir'], "temp", str(ip) + ".png")
oek = 'no'
if 'filebase' in self.formdata:
@@ -213,4 +213,4 @@ def write_from_shi(fname, fp):
with open(fname, 'wb') as f:
f.write(img)
- return "OK" \ No newline at end of file
+ return "OK"
diff --git a/cgi/weabot.py b/cgi/weabot.py
index a85c2e7..5757df2 100755
--- a/cgi/weabot.py
+++ b/cgi/weabot.py
@@ -599,7 +599,7 @@ class weabot(object):
# process files
if oek_file:
try:
- fname = "%s/%s/temp/%s.png" % (Settings.IMAGES_DIR, board['dir'], oek_file)
+ fname = os.path.join(Settings.IMAGES_DIR, board['dir'], "temp", oek_file + ".png")
with open(fname, 'rb') as f:
file = f.read()
except: