Merge pull request Tygs#91 from Shir0kamii/master

Fix burn_after_reading feature, along with zerobin.py
pyfidelity · Jan 8, 2016 · 7da1615 · 7da1615
2 parents a344dbb + 8c1379b
commit 7da1615
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/zerobin.py b/zerobin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from zerobin.routes import main
+from zerobin.cmd import main
 
 main()
diff --git a/zerobin/paste.py b/zerobin/paste.py
@@ -172,7 +172,6 @@ def save(self):
         # deleting the paste
         if "burn_after_reading" == self.expiration:
             expiration = self.expiration + '#%s' % datetime.now()  # TODO: use UTC dates
-            expiration = self.expiration
         else:
             expiration = as_unicode(self.expiration)