summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Maciaś <ursereg@gmail.com>2011-11-22 18:28:14 +0100
committerMateusz Maciaś <ursereg@gmail.com>2011-11-22 18:28:14 +0100
commita17533aa1c57995af0cf96f747ed118d406fd298 (patch)
tree53a5370a818c85ea8838d1d59b642ed0abe513e3
parente53c89e460f51d21938c2f9f9130f1e22f4324cd (diff)
parent8bf4441ebae76f7aaba89521e84fc53ca74d451f (diff)
downloaddoorman-a17533aa1c57995af0cf96f747ed118d406fd298.tar.gz
doorman-a17533aa1c57995af0cf96f747ed118d406fd298.tar.bz2
doorman-a17533aa1c57995af0cf96f747ed118d406fd298.tar.xz
doorman-a17533aa1c57995af0cf96f747ed118d406fd298.zip
Merge branch 'minefield' of github.com:tdubrownik/doorman into minefield
-rw-r--r--.gitignore1
-rw-r--r--admin/cards.csv0
-rw-r--r--admin/lib/csvstore.py4
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 0d20b64..f3d74a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*.pyc
+*~
diff --git a/admin/cards.csv b/admin/cards.csv
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/admin/cards.csv
diff --git a/admin/lib/csvstore.py b/admin/lib/csvstore.py
index 58a3056..317d6e2 100644
--- a/admin/lib/csvstore.py
+++ b/admin/lib/csvstore.py
@@ -24,7 +24,9 @@ class Storage(IterableUserDict):
self.encapsulation.begin_transaction()
def __del__(self):
- self.sync()
+ #TODO: fix this shit
+ #self.sync()
+ pass
def __setitem__(self, k, v):
IterableUserDict.__setitem__(self, k, v)
self.sync()