Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
ZODB
Commits
a5347703
Commit
a5347703
authored
Feb 27, 2004
by
Martijn Faassen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused imports.
parent
52c6285f
Changes
56
Hide whitespace changes
Inline
Side-by-side
Showing
56 changed files
with
41 additions
and
110 deletions
+41
-110
src/BTrees/tests/testSetOps.py
src/BTrees/tests/testSetOps.py
+0
-1
src/BTrees/tests/test_compare.py
src/BTrees/tests/test_compare.py
+0
-1
src/ThreadedAsync/__init__.py
src/ThreadedAsync/__init__.py
+2
-2
src/ZEO/ClientStorage.py
src/ZEO/ClientStorage.py
+1
-2
src/ZEO/DebugServer.py
src/ZEO/DebugServer.py
+1
-1
src/ZEO/cache.py
src/ZEO/cache.py
+0
-2
src/ZEO/runzeo.py
src/ZEO/runzeo.py
+0
-1
src/ZEO/tests/ConnectionTests.py
src/ZEO/tests/ConnectionTests.py
+0
-2
src/ZEO/tests/ThreadTests.py
src/ZEO/tests/ThreadTests.py
+0
-1
src/ZEO/tests/forker.py
src/ZEO/tests/forker.py
+0
-1
src/ZEO/tests/multi.py
src/ZEO/tests/multi.py
+0
-1
src/ZEO/tests/speed.py
src/ZEO/tests/speed.py
+2
-3
src/ZEO/tests/stress.py
src/ZEO/tests/stress.py
+0
-2
src/ZEO/tests/testAuth.py
src/ZEO/tests/testAuth.py
+0
-7
src/ZEO/tests/testMonitor.py
src/ZEO/tests/testMonitor.py
+1
-2
src/ZEO/tests/testZEO.py
src/ZEO/tests/testZEO.py
+0
-2
src/ZEO/tests/testZEOOptions.py
src/ZEO/tests/testZEOOptions.py
+0
-1
src/ZEO/tests/zeoserver.py
src/ZEO/tests/zeoserver.py
+0
-1
src/ZEO/zeoctl.py
src/ZEO/zeoctl.py
+0
-1
src/ZEO/zrpc/connection.py
src/ZEO/zrpc/connection.py
+0
-1
src/ZEO/zrpc/log.py
src/ZEO/zrpc/log.py
+0
-1
src/ZEO/zrpc/server.py
src/ZEO/zrpc/server.py
+1
-1
src/ZODB/BaseStorage.py
src/ZODB/BaseStorage.py
+1
-2
src/ZODB/Connection.py
src/ZODB/Connection.py
+2
-3
src/ZODB/DB.py
src/ZODB/DB.py
+3
-5
src/ZODB/FileStorage/FileStorage.py
src/ZODB/FileStorage/FileStorage.py
+2
-3
src/ZODB/FileStorage/format.py
src/ZODB/FileStorage/format.py
+2
-3
src/ZODB/Mount.py
src/ZODB/Mount.py
+3
-3
src/ZODB/POSException.py
src/ZODB/POSException.py
+1
-2
src/ZODB/Transaction.py
src/ZODB/Transaction.py
+2
-2
src/ZODB/dbmStorage.py
src/ZODB/dbmStorage.py
+1
-3
src/ZODB/fspack.py
src/ZODB/fspack.py
+1
-1
src/ZODB/fsrecover.py
src/ZODB/fsrecover.py
+2
-2
src/ZODB/fstools.py
src/ZODB/fstools.py
+1
-1
src/ZODB/tests/ConflictResolution.py
src/ZODB/tests/ConflictResolution.py
+0
-5
src/ZODB/tests/Corruption.py
src/ZODB/tests/Corruption.py
+0
-1
src/ZODB/tests/HistoryStorage.py
src/ZODB/tests/HistoryStorage.py
+0
-3
src/ZODB/tests/MTStorage.py
src/ZODB/tests/MTStorage.py
+1
-1
src/ZODB/tests/PackableStorage.py
src/ZODB/tests/PackableStorage.py
+0
-1
src/ZODB/tests/TransactionalUndoStorage.py
src/ZODB/tests/TransactionalUndoStorage.py
+1
-1
src/ZODB/tests/TransactionalUndoVersionStorage.py
src/ZODB/tests/TransactionalUndoVersionStorage.py
+0
-1
src/ZODB/tests/testCache.py
src/ZODB/tests/testCache.py
+0
-1
src/ZODB/tests/testConfig.py
src/ZODB/tests/testConfig.py
+0
-4
src/ZODB/tests/testDemoStorage.py
src/ZODB/tests/testDemoStorage.py
+1
-1
src/ZODB/tests/testFileStorage.py
src/ZODB/tests/testFileStorage.py
+2
-6
src/ZODB/tests/testMappingStorage.py
src/ZODB/tests/testMappingStorage.py
+1
-1
src/ZODB/tests/testTransaction.py
src/ZODB/tests/testTransaction.py
+1
-2
src/ZODB/tests/testfsIndex.py
src/ZODB/tests/testfsIndex.py
+1
-1
src/ZODB/zodb4/conversion.py
src/ZODB/zodb4/conversion.py
+1
-1
src/ZODB/zodb4/z4iterator.py
src/ZODB/zodb4/z4iterator.py
+1
-1
src/ZODB/zodb4/z4utils.py
src/ZODB/zodb4/z4utils.py
+0
-4
src/scripts/fstail.py
src/scripts/fstail.py
+1
-1
src/scripts/migrate.py
src/scripts/migrate.py
+0
-4
src/scripts/parsezeolog.py
src/scripts/parsezeolog.py
+0
-1
src/scripts/space.py
src/scripts/space.py
+0
-1
src/zLOG/EventLogger.py
src/zLOG/EventLogger.py
+1
-1
No files found.
src/BTrees/tests/testSetOps.py
View file @
a5347703
...
@@ -11,7 +11,6 @@
...
@@ -11,7 +11,6 @@
# FOR A PARTICULAR PURPOSE
# FOR A PARTICULAR PURPOSE
#
#
##############################################################################
##############################################################################
import
random
from
unittest
import
TestCase
,
TestSuite
,
TextTestRunner
,
makeSuite
from
unittest
import
TestCase
,
TestSuite
,
TextTestRunner
,
makeSuite
from
BTrees.OOBTree
import
OOBTree
,
OOBucket
,
OOSet
,
OOTreeSet
from
BTrees.OOBTree
import
OOBTree
,
OOBucket
,
OOSet
,
OOTreeSet
...
...
src/BTrees/tests/test_compare.py
View file @
a5347703
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
import
unittest
import
unittest
import
ZODB
from
ZODB.MappingStorage
import
MappingStorage
from
ZODB.MappingStorage
import
MappingStorage
from
ZODB.DB
import
DB
from
ZODB.DB
import
DB
...
...
src/ThreadedAsync/__init__.py
View file @
a5347703
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
##############################################################################
##############################################################################
"""Manage the asyncore mainloop in a multi-threaded app.
"""Manage the asyncore mainloop in a multi-threaded app.
$Id: __init__.py,v 1.
7 2003/10/02 18:17:26 jeremy
Exp $
$Id: __init__.py,v 1.
8 2004/02/27 00:31:51 faassen
Exp $
"""
"""
from
LoopCallback
import
register_loop_callback
,
loop
,
remove_loop_callback
from
LoopCallback
import
register_loop_callback
,
remove_loop_callback
src/ZEO/ClientStorage.py
View file @
a5347703
...
@@ -29,8 +29,7 @@ import types
...
@@ -29,8 +29,7 @@ import types
from
ZEO
import
ServerStub
from
ZEO
import
ServerStub
from
ZEO.cache
import
ClientCache
from
ZEO.cache
import
ClientCache
from
ZEO.TransactionBuffer
import
TransactionBuffer
from
ZEO.TransactionBuffer
import
TransactionBuffer
from
ZEO.Exceptions
import
ClientStorageError
,
UnrecognizedResult
,
\
from
ZEO.Exceptions
import
ClientStorageError
,
ClientDisconnected
,
AuthError
ClientDisconnected
,
AuthError
from
ZEO.auth
import
get_module
from
ZEO.auth
import
get_module
from
ZEO.zrpc.client
import
ConnectionManager
from
ZEO.zrpc.client
import
ConnectionManager
...
...
src/ZEO/DebugServer.py
View file @
a5347703
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
import
struct
import
struct
import
time
import
time
from
ZEO.StorageServer
import
StorageServer
,
ZEOStorage
,
log
from
ZEO.StorageServer
import
StorageServer
,
log
from
ZEO.zrpc.server
import
ManagedServerConnection
from
ZEO.zrpc.server
import
ManagedServerConnection
# a bunch of codes
# a bunch of codes
...
...
src/ZEO/cache.py
View file @
a5347703
...
@@ -29,8 +29,6 @@ import struct
...
@@ -29,8 +29,6 @@ import struct
import
tempfile
import
tempfile
import
time
import
time
from
sets
import
Set
from
ZODB.utils
import
z64
,
u64
from
ZODB.utils
import
z64
,
u64
##
##
...
...
src/ZEO/runzeo.py
View file @
a5347703
...
@@ -34,7 +34,6 @@ Unless -C is specified, -a and -f are required.
...
@@ -34,7 +34,6 @@ Unless -C is specified, -a and -f are required.
import
os
import
os
import
sys
import
sys
import
getopt
import
signal
import
signal
import
socket
import
socket
...
...
src/ZEO/tests/ConnectionTests.py
View file @
a5347703
...
@@ -16,7 +16,6 @@ import os
...
@@ -16,7 +16,6 @@ import os
import
sys
import
sys
import
time
import
time
import
random
import
random
import
socket
import
asyncore
import
asyncore
import
tempfile
import
tempfile
import
threading
import
threading
...
@@ -27,7 +26,6 @@ import ZEO.ServerStub
...
@@ -27,7 +26,6 @@ import ZEO.ServerStub
from
ZEO.ClientStorage
import
ClientStorage
from
ZEO.ClientStorage
import
ClientStorage
from
ZEO.Exceptions
import
ClientDisconnected
from
ZEO.Exceptions
import
ClientDisconnected
from
ZEO.zrpc.marshal
import
Marshaller
from
ZEO.zrpc.marshal
import
Marshaller
from
ZEO.zrpc.error
import
DisconnectedError
from
ZEO.tests
import
forker
from
ZEO.tests
import
forker
from
ZODB.DB
import
DB
from
ZODB.DB
import
DB
...
...
src/ZEO/tests/ThreadTests.py
View file @
a5347703
...
@@ -19,7 +19,6 @@ from ZODB.Transaction import Transaction
...
@@ -19,7 +19,6 @@ from ZODB.Transaction import Transaction
from
ZODB.tests.StorageTestBase
import
zodb_pickle
,
MinPO
from
ZODB.tests.StorageTestBase
import
zodb_pickle
,
MinPO
import
ZEO.ClientStorage
import
ZEO.ClientStorage
from
ZEO.Exceptions
import
ClientDisconnected
ZERO
=
'
\
0
'
*
8
ZERO
=
'
\
0
'
*
8
...
...
src/ZEO/tests/forker.py
View file @
a5347703
...
@@ -17,7 +17,6 @@ import os
...
@@ -17,7 +17,6 @@ import os
import
sys
import
sys
import
time
import
time
import
errno
import
errno
import
random
import
socket
import
socket
import
StringIO
import
StringIO
import
tempfile
import
tempfile
...
...
src/ZEO/tests/multi.py
View file @
a5347703
...
@@ -19,7 +19,6 @@ import persistent
...
@@ -19,7 +19,6 @@ import persistent
import
persistent.mapping
import
persistent.mapping
from
ZEO.tests
import
forker
from
ZEO.tests
import
forker
import
asyncore
import
os
import
os
import
tempfile
import
tempfile
import
time
import
time
...
...
src/ZEO/tests/speed.py
View file @
a5347703
...
@@ -42,12 +42,11 @@ Options:
...
@@ -42,12 +42,11 @@ Options:
"""
"""
import
asyncore
import
asyncore
import
sys
,
os
,
getopt
,
string
,
time
import
sys
,
os
,
getopt
,
time
##sys.path.insert(0, os.getcwd())
##sys.path.insert(0, os.getcwd())
import
ZODB
,
ZODB
.
FileStorage
import
ZODB
import
persistent
import
persistent
import
ZEO.ClientStorage
,
ZEO
.
StorageServer
from
ZEO.tests
import
forker
from
ZEO.tests
import
forker
from
ZODB.POSException
import
ConflictError
from
ZODB.POSException
import
ConflictError
...
...
src/ZEO/tests/stress.py
View file @
a5347703
...
@@ -23,11 +23,9 @@ from ZEO.ClientStorage import ClientStorage
...
@@ -23,11 +23,9 @@ from ZEO.ClientStorage import ClientStorage
from
ZODB.MappingStorage
import
MappingStorage
from
ZODB.MappingStorage
import
MappingStorage
from
ZEO.tests
import
forker
from
ZEO.tests
import
forker
from
ZODB.tests
import
MinPO
from
ZODB.tests
import
MinPO
import
zLOG
import
os
import
os
import
random
import
random
import
sys
import
types
import
types
NUM_TRANSACTIONS_PER_CONN
=
10
NUM_TRANSACTIONS_PER_CONN
=
10
...
...
src/ZEO/tests/testAuth.py
View file @
a5347703
...
@@ -18,17 +18,10 @@ import tempfile
...
@@ -18,17 +18,10 @@ import tempfile
import
time
import
time
import
unittest
import
unittest
import
zLOG
from
ThreadedAsync
import
LoopCallback
from
ZEO
import
zeopasswd
from
ZEO
import
zeopasswd
from
ZEO.ClientStorage
import
ClientStorage
from
ZEO.Exceptions
import
ClientDisconnected
from
ZEO.Exceptions
import
ClientDisconnected
from
ZEO.StorageServer
import
StorageServer
from
ZEO.tests.ConnectionTests
import
CommonSetupTearDown
from
ZEO.tests.ConnectionTests
import
CommonSetupTearDown
from
ZODB.FileStorage
import
FileStorage
class
AuthTest
(
CommonSetupTearDown
):
class
AuthTest
(
CommonSetupTearDown
):
__super_getServerConfig
=
CommonSetupTearDown
.
getServerConfig
__super_getServerConfig
=
CommonSetupTearDown
.
getServerConfig
__super_setUp
=
CommonSetupTearDown
.
setUp
__super_setUp
=
CommonSetupTearDown
.
setUp
...
...
src/ZEO/tests/testMonitor.py
View file @
a5347703
...
@@ -13,11 +13,10 @@
...
@@ -13,11 +13,10 @@
##############################################################################
##############################################################################
"""Test that the monitor produce sensible results.
"""Test that the monitor produce sensible results.
$Id: testMonitor.py,v 1.
8 2003/11/28 16:44:48 jim
Exp $
$Id: testMonitor.py,v 1.
9 2004/02/27 00:31:52 faassen
Exp $
"""
"""
import
socket
import
socket
import
time
import
unittest
import
unittest
from
ZEO.tests.ConnectionTests
import
CommonSetupTearDown
from
ZEO.tests.ConnectionTests
import
CommonSetupTearDown
...
...
src/ZEO/tests/testZEO.py
View file @
a5347703
...
@@ -15,8 +15,6 @@
...
@@ -15,8 +15,6 @@
# System imports
# System imports
import
os
import
os
import
sys
import
time
import
random
import
random
import
socket
import
socket
import
asyncore
import
asyncore
...
...
src/ZEO/tests/testZEOOptions.py
View file @
a5347703
...
@@ -18,7 +18,6 @@ import os
...
@@ -18,7 +18,6 @@ import os
import
sys
import
sys
import
tempfile
import
tempfile
import
unittest
import
unittest
from
StringIO
import
StringIO
import
ZODB.config
import
ZODB.config
...
...
src/ZEO/tests/zeoserver.py
View file @
a5347703
...
@@ -18,7 +18,6 @@ import sys
...
@@ -18,7 +18,6 @@ import sys
import
time
import
time
import
errno
import
errno
import
getopt
import
getopt
import
random
import
socket
import
socket
import
signal
import
signal
import
asyncore
import
asyncore
...
...
src/ZEO/zeoctl.py
View file @
a5347703
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
import
os
import
os
import
ZEO
import
ZEO
import
zLOG
import
zdaemon.zdctl
import
zdaemon.zdctl
...
...
src/ZEO/zrpc/connection.py
View file @
a5347703
...
@@ -25,7 +25,6 @@ from ZEO.zrpc.log import short_repr, log
...
@@ -25,7 +25,6 @@ from ZEO.zrpc.log import short_repr, log
from
ZEO.zrpc.marshal
import
Marshaller
from
ZEO.zrpc.marshal
import
Marshaller
from
ZEO.zrpc.trigger
import
trigger
from
ZEO.zrpc.trigger
import
trigger
import
zLOG
import
zLOG
from
ZODB
import
POSException
REPLY
=
".reply"
# message name used for replies
REPLY
=
".reply"
# message name used for replies
ASYNC
=
1
ASYNC
=
1
...
...
src/ZEO/zrpc/log.py
View file @
a5347703
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
#
#
##############################################################################
##############################################################################
import
os
import
os
import
types
import
zLOG
import
zLOG
import
threading
import
threading
...
...
src/ZEO/zrpc/server.py
View file @
a5347703
...
@@ -15,7 +15,7 @@ import asyncore
...
@@ -15,7 +15,7 @@ import asyncore
import
socket
import
socket
import
types
import
types
from
ZEO.zrpc.connection
import
Connection
,
Delay
from
ZEO.zrpc.connection
import
Connection
from
ZEO.zrpc.log
import
log
from
ZEO.zrpc.log
import
log
import
zLOG
import
zLOG
import
ThreadedAsync.LoopCallback
import
ThreadedAsync.LoopCallback
...
...
src/ZODB/BaseStorage.py
View file @
a5347703
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
##############################################################################
##############################################################################
"""Handy standard storage machinery
"""Handy standard storage machinery
$Id: BaseStorage.py,v 1.4
3 2004/02/26 22:53:23 jeremy
Exp $
$Id: BaseStorage.py,v 1.4
4 2004/02/27 00:31:53 faassen
Exp $
"""
"""
import
cPickle
import
cPickle
import
threading
import
threading
...
@@ -26,7 +26,6 @@ from persistent.TimeStamp import TimeStamp
...
@@ -26,7 +26,6 @@ from persistent.TimeStamp import TimeStamp
import
zLOG
import
zLOG
from
ZODB
import
POSException
from
ZODB
import
POSException
from
ZODB.UndoLogCompatible
import
UndoLogCompatible
from
ZODB.UndoLogCompatible
import
UndoLogCompatible
from
ZODB.utils
import
z64
class
BaseStorage
(
UndoLogCompatible
):
class
BaseStorage
(
UndoLogCompatible
):
_transaction
=
None
# Transaction that is being committed
_transaction
=
None
# Transaction that is being committed
...
...
src/ZODB/Connection.py
View file @
a5347703
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
##############################################################################
##############################################################################
"""Database connection support
"""Database connection support
$Id: Connection.py,v 1.12
6 2004/02/26 22:57:09 jeremy
Exp $"""
$Id: Connection.py,v 1.12
7 2004/02/27 00:31:53 faassen
Exp $"""
import
logging
import
logging
import
sys
import
sys
...
@@ -24,7 +24,6 @@ from time import time
...
@@ -24,7 +24,6 @@ from time import time
from
utils
import
u64
from
utils
import
u64
from
persistent
import
PickleCache
from
persistent
import
PickleCache
from
zLOG
import
LOG
,
ERROR
,
BLATHER
,
WARNING
from
ZODB.ConflictResolution
import
ResolvedSerial
from
ZODB.ConflictResolution
import
ResolvedSerial
from
ZODB.ExportImport
import
ExportImport
from
ZODB.ExportImport
import
ExportImport
...
@@ -115,7 +114,7 @@ class Connection(ExportImport, object):
...
@@ -115,7 +114,7 @@ class Connection(ExportImport, object):
@group Other Methods: oldstate, exchange, getDebugInfo, setDebugInfo,
@group Other Methods: oldstate, exchange, getDebugInfo, setDebugInfo,
getTransferCounts
getTransferCounts
$Id: Connection.py,v 1.12
6 2004/02/26 22:57:09 jeremy
Exp $
$Id: Connection.py,v 1.12
7 2004/02/27 00:31:53 faassen
Exp $
"""
"""
_tmp
=
None
_tmp
=
None
...
...
src/ZODB/DB.py
View file @
a5347703
...
@@ -13,10 +13,10 @@
...
@@ -13,10 +13,10 @@
##############################################################################
##############################################################################
"""Database objects
"""Database objects
$Id: DB.py,v 1.6
3 2004/02/25 12:31:56 jim
Exp $"""
$Id: DB.py,v 1.6
4 2004/02/27 00:31:53 faassen
Exp $"""
__version__
=
'$Revision: 1.6
3
$'
[
11
:
-
2
]
__version__
=
'$Revision: 1.6
4
$'
[
11
:
-
2
]
import
cPickle
,
cStringIO
,
sys
,
POSException
,
UndoLogCompatible
import
cPickle
,
cStringIO
,
sys
,
UndoLogCompatible
from
Connection
import
Connection
from
Connection
import
Connection
from
thread
import
allocate_lock
from
thread
import
allocate_lock
from
Transaction
import
Transaction
,
get_transaction
from
Transaction
import
Transaction
,
get_transaction
...
@@ -25,8 +25,6 @@ from time import time, ctime
...
@@ -25,8 +25,6 @@ from time import time, ctime
from
zLOG
import
LOG
,
ERROR
from
zLOG
import
LOG
,
ERROR
from
ZODB.broken
import
find_global
from
ZODB.broken
import
find_global
from
types
import
StringType
def
list2dict
(
L
):
def
list2dict
(
L
):
d
=
{}
d
=
{}
for
elt
in
L
:
for
elt
in
L
:
...
...
src/ZODB/FileStorage/FileStorage.py
View file @
a5347703
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
##############################################################################
##############################################################################
"""Storage implementation using a log written to a single file.
"""Storage implementation using a log written to a single file.
$Revision: 1.
6
$
$Revision: 1.
7
$
"""
"""
import
base64
import
base64
...
@@ -38,8 +38,7 @@ from ZODB.utils import p64, u64, cp, z64
...
@@ -38,8 +38,7 @@ from ZODB.utils import p64, u64, cp, z64
from
ZODB.FileStorage.fspack
import
FileStoragePacker
from
ZODB.FileStorage.fspack
import
FileStoragePacker
from
ZODB.FileStorage.format
\
from
ZODB.FileStorage.format
\
import
FileStorageFormatter
,
DataHeader
,
TxnHeader
,
DATA_HDR
,
\
import
FileStorageFormatter
,
DataHeader
,
TxnHeader
,
DATA_HDR
,
\
DATA_HDR_LEN
,
TRANS_HDR
,
TRANS_HDR_LEN
,
CorruptedDataError
,
\
DATA_HDR_LEN
,
TRANS_HDR
,
TRANS_HDR_LEN
,
CorruptedDataError
DATA_VERSION_HDR_LEN
try
:
try
:
from
ZODB.fsIndex
import
fsIndex
from
ZODB.fsIndex
import
fsIndex
...
...
src/ZODB/FileStorage/format.py
View file @
a5347703
...
@@ -117,9 +117,8 @@
...
@@ -117,9 +117,8 @@
import
struct
import
struct
from
ZODB.POSException
import
POSKeyError
from
ZODB.POSException
import
POSKeyError
from
ZODB.serialize
import
referencesf
from
ZODB.utils
import
u64
,
oid_repr
,
t32
from
ZODB.utils
import
p64
,
u64
,
z64
,
oid_repr
,
t32
from
zLOG
import
LOG
,
ERROR
from
zLOG
import
LOG
,
BLATHER
,
WARNING
,
ERROR
,
PANIC
class
CorruptedError
(
Exception
):
class
CorruptedError
(
Exception
):
pass
pass
...
...
src/ZODB/Mount.py
View file @
a5347703
...
@@ -13,14 +13,14 @@
...
@@ -13,14 +13,14 @@
##############################################################################
##############################################################################
"""Mounted database support
"""Mounted database support
$Id: Mount.py,v 1.2
1 2003/11/28 16:44:49 jim
Exp $"""
$Id: Mount.py,v 1.2
2 2004/02/27 00:31:53 faassen
Exp $"""
__version__
=
'$Revision: 1.2
1
$'
[
11
:
-
2
]
__version__
=
'$Revision: 1.2
2
$'
[
11
:
-
2
]
import
thread
,
persistent
,
Acquisition
import
thread
,
persistent
,
Acquisition
from
Acquisition
import
aq_base
from
Acquisition
import
aq_base
import
string
,
time
,
sys
import
string
,
time
,
sys
from
POSException
import
MountedStorageError
from
POSException
import
MountedStorageError
from
zLOG
import
LOG
,
ERROR
,
INFO
,
WARNING
from
zLOG
import
LOG
,
INFO
,
WARNING
# dbs is a holder for all DB objects, needed to overcome
# dbs is a holder for all DB objects, needed to overcome
# threading issues. It maps connection params to a DB object
# threading issues. It maps connection params to a DB object
...
...
src/ZODB/POSException.py
View file @
a5347703
...
@@ -13,9 +13,8 @@
...
@@ -13,9 +13,8 @@
##############################################################################
##############################################################################
"""ZODB-defined exceptions
"""ZODB-defined exceptions
$Id: POSException.py,v 1.2
2 2003/11/28 16:44:49 jim
Exp $"""
$Id: POSException.py,v 1.2
3 2004/02/27 00:31:53 faassen
Exp $"""
from
types
import
StringType
,
DictType
from
ZODB.utils
import
oid_repr
,
serial_repr
from
ZODB.utils
import
oid_repr
,
serial_repr
def
_fmt_undo
(
oid
,
reason
):
def
_fmt_undo
(
oid
,
reason
):
...
...
src/ZODB/Transaction.py
View file @
a5347703
...
@@ -13,13 +13,13 @@
...
@@ -13,13 +13,13 @@
##############################################################################
##############################################################################
"""Transaction management
"""Transaction management
$Id: Transaction.py,v 1.5
7 2004/02/19 02:59:06 jeremy
Exp $
$Id: Transaction.py,v 1.5
8 2004/02/27 00:31:53 faassen
Exp $
"""
"""
import
sys
import
sys
from
thread
import
get_ident
as
_get_ident
from
thread
import
get_ident
as
_get_ident
from
zLOG
import
LOG
,
ERROR
,
PANIC
,
INFO
,
BLATHER
,
WARNING
from
zLOG
import
LOG
,
ERROR
,
PANIC
,
INFO
,
BLATHER
,
WARNING
from
ZODB.POSException
import
ConflictError
,
TransactionError
from
ZODB.POSException
import
TransactionError
from
ZODB.utils
import
oid_repr
from
ZODB.utils
import
oid_repr
# Flag indicating whether certain errors have occurred.
# Flag indicating whether certain errors have occurred.
...
...
src/ZODB/dbmStorage.py
View file @
a5347703
...
@@ -18,9 +18,7 @@ don't support versions or Undo. This may be useful when implementing
...
@@ -18,9 +18,7 @@ don't support versions or Undo. This may be useful when implementing
objects like hit counters that don't need or want to participate
objects like hit counters that don't need or want to participate
in undo or versions.
in undo or versions.
"""
"""
__version__
=
'$Revision: 1.4 $'
[
11
:
-
2
]
__version__
=
'$Revision: 1.5 $'
[
11
:
-
2
]
import
base64
,
POSException
,
time
,
string
,
utils
from
MappingStorage
import
MappingStorage
from
MappingStorage
import
MappingStorage
from
BaseStorage
import
BaseStorage
from
BaseStorage
import
BaseStorage
...
...
src/ZODB/fspack.py
View file @
a5347703
...
@@ -34,7 +34,7 @@ from types import StringType
...
@@ -34,7 +34,7 @@ from types import StringType
from
ZODB.serialize
import
referencesf
from
ZODB.serialize
import
referencesf
from
ZODB.utils
import
p64
,
u64
,
z64
,
oid_repr
from
ZODB.utils
import
p64
,
u64
,
z64
,
oid_repr
from
zLOG
import
LOG
,
BLATHER
,
WARNING
,
ERROR
,
PANIC
from
zLOG
import
LOG
,
ERROR
try
:
try
:
from
ZODB.fsIndex
import
fsIndex
from
ZODB.fsIndex
import
fsIndex
...
...
src/ZODB/fsrecover.py
View file @
a5347703
...
@@ -80,9 +80,9 @@ except ImportError:
...
@@ -80,9 +80,9 @@ except ImportError:
import
ZODB
import
ZODB
import
getopt
,
ZODB
.
FileStorage
,
struct
,
time
import
getopt
,
ZODB
.
FileStorage
,
time
from
struct
import
unpack
from
struct
import
unpack
from
ZODB.utils
import
t32
,
p64
,
u64
from
ZODB.utils
import
t32
,
u64
from
persistent.TimeStamp
import
TimeStamp
from
persistent.TimeStamp
import
TimeStamp
from
cPickle
import
loads
from
cPickle
import
loads
from
ZODB.FileStorage
import
RecordIterator
from
ZODB.FileStorage
import
RecordIterator
...
...
src/ZODB/fstools.py
View file @
a5347703
...
@@ -23,7 +23,7 @@ import struct
...
@@ -23,7 +23,7 @@ import struct
from
ZODB.FileStorage.format
import
TRANS_HDR
,
DATA_HDR
,
TRANS_HDR_LEN
,
\
from
ZODB.FileStorage.format
import
TRANS_HDR
,
DATA_HDR
,
TRANS_HDR_LEN
,
\
DATA_HDR_LEN
,
DATA_VERSION_HDR_LEN
DATA_HDR_LEN
,
DATA_VERSION_HDR_LEN
from
ZODB.utils
import
p64
,
u64
from
ZODB.utils
import
u64
from
persistent.TimeStamp
import
TimeStamp
from
persistent.TimeStamp
import
TimeStamp
class
TxnHeader
:
class
TxnHeader
:
...
...
src/ZODB/tests/ConflictResolution.py
View file @
a5347703
...
@@ -19,11 +19,6 @@ from persistent import Persistent
...
@@ -19,11 +19,6 @@ from persistent import Persistent
from
ZODB.tests.StorageTestBase
import
zodb_unpickle
,
zodb_pickle
from
ZODB.tests.StorageTestBase
import
zodb_unpickle
,
zodb_pickle
import
sys
import
types
from
cPickle
import
Pickler
,
Unpickler
from
cStringIO
import
StringIO
class
PCounter
(
Persistent
):
class
PCounter
(
Persistent
):
_value
=
0
_value
=
0
...
...
src/ZODB/tests/Corruption.py
View file @
a5347703
...
@@ -17,7 +17,6 @@ import os
...
@@ -17,7 +17,6 @@ import os
import
random
import
random
import
stat
import
stat
import
tempfile
import
tempfile
import
unittest
import
ZODB
,
ZODB
.
FileStorage
import
ZODB
,
ZODB
.
FileStorage
from
StorageTestBase
import
StorageTestBase
from
StorageTestBase
import
StorageTestBase
...
...
src/ZODB/tests/HistoryStorage.py
View file @
a5347703
...
@@ -19,9 +19,6 @@ all these tests.
...
@@ -19,9 +19,6 @@ all these tests.
from
ZODB.Transaction
import
Transaction
from
ZODB.Transaction
import
Transaction
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.StorageTestBase
import
zodb_unpickle
class
HistoryStorage
:
class
HistoryStorage
:
def
checkSimpleHistory
(
self
):
def
checkSimpleHistory
(
self
):
...
...
src/ZODB/tests/MTStorage.py
View file @
a5347703
...
@@ -7,7 +7,7 @@ import ZODB
...
@@ -7,7 +7,7 @@ import ZODB
from
persistent.mapping
import
PersistentMapping
from
persistent.mapping
import
PersistentMapping
from
ZODB.tests.StorageTestBase
\
from
ZODB.tests.StorageTestBase
\
import
StorageTestBase
,
zodb_pickle
,
zodb_unpickle
,
handle_serials
import
zodb_pickle
,
zodb_unpickle
,
handle_serials
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.Transaction
import
Transaction
from
ZODB.Transaction
import
Transaction
from
ZODB.POSException
import
ConflictError
from
ZODB.POSException
import
ConflictError
...
...
src/ZODB/tests/PackableStorage.py
View file @
a5347703
...
@@ -34,7 +34,6 @@ from ZODB.serialize import referencesf
...
@@ -34,7 +34,6 @@ from ZODB.serialize import referencesf
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.StorageTestBase
import
snooze
from
ZODB.tests.StorageTestBase
import
snooze
from
ZODB.POSException
import
ConflictError
,
StorageError
from
ZODB.POSException
import
ConflictError
,
StorageError
from
ZODB.FileStorage
import
FileStorage
from
ZODB.tests.MTStorage
import
TestThread
from
ZODB.tests.MTStorage
import
TestThread
...
...
src/ZODB/tests/TransactionalUndoStorage.py
View file @
a5347703
...
@@ -21,7 +21,7 @@ import types
...
@@ -21,7 +21,7 @@ import types
from
ZODB
import
POSException
from
ZODB
import
POSException
from
ZODB.Transaction
import
Transaction
from
ZODB.Transaction
import
Transaction
from
ZODB.serialize
import
referencesf
from
ZODB.serialize
import
referencesf
from
ZODB.utils
import
u64
,
p64
from
ZODB.utils
import
p64
from
ZODB
import
DB
from
ZODB
import
DB
from
persistent
import
Persistent
from
persistent
import
Persistent
...
...
src/ZODB/tests/TransactionalUndoVersionStorage.py
View file @
a5347703
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
import
time
import
time
from
ZODB
import
POSException
from
ZODB.serialize
import
referencesf
from
ZODB.serialize
import
referencesf
from
ZODB.Transaction
import
Transaction
from
ZODB.Transaction
import
Transaction
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.MinPO
import
MinPO
...
...
src/ZODB/tests/testCache.py
View file @
a5347703
...
@@ -25,7 +25,6 @@ import gc
...
@@ -25,7 +25,6 @@ import gc
import
ZODB
import
ZODB
import
ZODB.MappingStorage
import
ZODB.MappingStorage
from
ZODB.POSException
import
ConflictError
from
persistent.cPickleCache
import
PickleCache
from
persistent.cPickleCache
import
PickleCache
from
persistent.mapping
import
PersistentMapping
from
persistent.mapping
import
PersistentMapping
from
ZODB.tests.MinPO
import
MinPO
from
ZODB.tests.MinPO
import
MinPO
...
...
src/ZODB/tests/testConfig.py
View file @
a5347703
...
@@ -12,14 +12,10 @@
...
@@ -12,14 +12,10 @@
#
#
##############################################################################
##############################################################################
import
os
import
errno
import
shutil
import
tempfile
import
tempfile
import
unittest
import
unittest
import
ZODB.config
import
ZODB.config
import
ZODB.tests
from
ZODB.POSException
import
ReadOnlyError
from
ZODB.POSException
import
ReadOnlyError
...
...
src/ZODB/tests/testDemoStorage.py
View file @
a5347703
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
##############################################################################
##############################################################################
import
ZODB.DemoStorage
import
ZODB.DemoStorage
import
os
,
unittest
import
unittest
from
ZODB.tests
import
StorageTestBase
,
BasicStorage
,
\
from
ZODB.tests
import
StorageTestBase
,
BasicStorage
,
\
VersionStorage
,
Synchronization
VersionStorage
,
Synchronization
...
...
src/ZODB/tests/testFileStorage.py
View file @
a5347703
...
@@ -12,13 +12,9 @@
...
@@ -12,13 +12,9 @@
#
#
##############################################################################
##############################################################################
import
ZODB.FileStorage
import
ZODB.FileStorage
import
sys
,
os
,
unittest
import
os
,
unittest
import
errno
import
filecmp
import
StringIO
from
ZODB.Transaction
import
Transaction
from
ZODB.Transaction
import
Transaction
from
ZODB
import
POSException
from
ZODB
import
POSException
from
ZODB.fsrecover
import
recover
from
ZODB.tests
import
StorageTestBase
,
BasicStorage
,
\
from
ZODB.tests
import
StorageTestBase
,
BasicStorage
,
\
TransactionalUndoStorage
,
VersionStorage
,
\
TransactionalUndoStorage
,
VersionStorage
,
\
...
@@ -26,7 +22,7 @@ from ZODB.tests import StorageTestBase, BasicStorage, \
...
@@ -26,7 +22,7 @@ from ZODB.tests import StorageTestBase, BasicStorage, \
Synchronization
,
ConflictResolution
,
HistoryStorage
,
\
Synchronization
,
ConflictResolution
,
HistoryStorage
,
\
IteratorStorage
,
Corruption
,
RevisionStorage
,
PersistentStorage
,
\
IteratorStorage
,
Corruption
,
RevisionStorage
,
PersistentStorage
,
\
MTStorage
,
ReadOnlyStorage
,
RecoveryStorage
MTStorage
,
ReadOnlyStorage
,
RecoveryStorage
from
ZODB.tests.StorageTestBase
import
MinPO
,
zodb_
unpickle
,
zodb_
pickle
from
ZODB.tests.StorageTestBase
import
MinPO
,
zodb_pickle
class
BaseFileStorageTests
(
StorageTestBase
.
StorageTestBase
):
class
BaseFileStorageTests
(
StorageTestBase
.
StorageTestBase
):
...
...
src/ZODB/tests/testMappingStorage.py
View file @
a5347703
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
##############################################################################
##############################################################################
import
ZODB.MappingStorage
import
ZODB.MappingStorage
import
os
,
unittest
import
unittest
from
ZODB.tests
import
StorageTestBase
from
ZODB.tests
import
StorageTestBase
from
ZODB.tests
\
from
ZODB.tests
\
...
...
src/ZODB/tests/testTransaction.py
View file @
a5347703
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
"""
"""
Revision information:
Revision information:
$Id: testTransaction.py,v 1.1
8 2004/02/19 02:59:10 jeremy
Exp $
$Id: testTransaction.py,v 1.1
9 2004/02/27 00:31:55 faassen
Exp $
"""
"""
"""
"""
...
@@ -44,7 +44,6 @@ TODO
...
@@ -44,7 +44,6 @@ TODO
"""
"""
import
random
from
types
import
TupleType
from
types
import
TupleType
import
unittest
import
unittest
...
...
src/ZODB/tests/testfsIndex.py
View file @
a5347703
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
# FOR A PARTICULAR PURPOSE.
#
#
##############################################################################
##############################################################################
import
unittest
,
sys
import
unittest
from
ZODB.fsIndex
import
fsIndex
from
ZODB.fsIndex
import
fsIndex
from
ZODB.utils
import
p64
from
ZODB.utils
import
p64
...
...
src/ZODB/zodb4/conversion.py
View file @
a5347703
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
"""Nitty-gritty conversion of a ZODB 4 FileStorage to a ZODB 3 FileStorage."""
"""Nitty-gritty conversion of a ZODB 4 FileStorage to a ZODB 3 FileStorage."""
import
sys
import
sys
from
cPickle
import
dumps
,
Pickler
,
Unpickler
from
cPickle
import
Pickler
,
Unpickler
from
cStringIO
import
StringIO
from
cStringIO
import
StringIO
from
ZODB.FileStorage
import
FileStorage
from
ZODB.FileStorage
import
FileStorage
...
...
src/ZODB/zodb4/z4iterator.py
View file @
a5347703
...
@@ -18,7 +18,7 @@ from struct import unpack
...
@@ -18,7 +18,7 @@ from struct import unpack
from
ZODB.zodb4.z4interfaces
import
ZERO
from
ZODB.zodb4.z4interfaces
import
ZERO
from
ZODB.zodb4.z4utils
import
u64
,
splitrefs
from
ZODB.zodb4.z4utils
import
u64
,
splitrefs
from
ZODB.zodb4.z4format
import
FileStorageFormatter
,
DataHeader
,
TxnHeader
from
ZODB.zodb4.z4format
import
FileStorageFormatter
from
ZODB.zodb4.z4format
import
TRANS_HDR
,
TRANS_HDR_LEN
,
DATA_HDR
from
ZODB.zodb4.z4format
import
TRANS_HDR
,
TRANS_HDR_LEN
,
DATA_HDR
from
ZODB.zodb4.z4format
import
DATA_HDR_LEN
,
DATA_VERSION_HDR_LEN
from
ZODB.zodb4.z4format
import
DATA_HDR_LEN
,
DATA_VERSION_HDR_LEN
...
...
src/ZODB/zodb4/z4utils.py
View file @
a5347703
...
@@ -14,11 +14,7 @@
...
@@ -14,11 +14,7 @@
# originally zodb.utils
# originally zodb.utils
from
persistent.TimeStamp
import
TimeStamp
import
struct
import
struct
import
time
from
sets
import
Set
def
p64
(
v
):
def
p64
(
v
):
"""Pack an integer or long into a 8-byte string"""
"""Pack an integer or long into a 8-byte string"""
...
...
src/scripts/fstail.py
View file @
a5347703
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
##############################################################################
##############################################################################
"""Tool to dump the last few transactions from a FileStorage."""
"""Tool to dump the last few transactions from a FileStorage."""
from
ZODB.fstools
import
prev_txn
,
TxnHeader
from
ZODB.fstools
import
prev_txn
import
binascii
import
binascii
import
getopt
import
getopt
...
...
src/scripts/migrate.py
View file @
a5347703
...
@@ -74,17 +74,13 @@ Positional arguments:
...
@@ -74,17 +74,13 @@ Positional arguments:
pairs. E.g. "name=full;frequency=3600"
pairs. E.g. "name=full;frequency=3600"
"""
"""
import
os
import
re
import
re
import
sys
import
sys
import
time
import
time
import
errno
import
getopt
import
getopt
import
marshal
import
marshal
import
profile
import
profile
import
traceback
import
ZODB
from
ZODB
import
utils
from
ZODB
import
utils
from
ZODB
import
StorageTypes
from
ZODB
import
StorageTypes
from
ZODB.TimeStamp
import
TimeStamp
from
ZODB.TimeStamp
import
TimeStamp
...
...
src/scripts/parsezeolog.py
View file @
a5347703
...
@@ -5,7 +5,6 @@ An example of the log format is:
...
@@ -5,7 +5,6 @@ An example of the log format is:
2002-04-15T13:05:29 BLATHER(-100) ZEO Server storea(3235680, [714], 235339406490168806) ('10.0.26.30', 45514)
2002-04-15T13:05:29 BLATHER(-100) ZEO Server storea(3235680, [714], 235339406490168806) ('10.0.26.30', 45514)
"""
"""
import
operator
import
re
import
re
import
time
import
time
...
...
src/scripts/space.py
View file @
a5347703
...
@@ -9,7 +9,6 @@ The current implementation only supports FileStorage.
...
@@ -9,7 +9,6 @@ The current implementation only supports FileStorage.
Current limitations / simplifications: Ignores revisions and versions.
Current limitations / simplifications: Ignores revisions and versions.
"""
"""
import
ZODB
from
ZODB.FileStorage
import
FileStorage
from
ZODB.FileStorage
import
FileStorage
from
ZODB.utils
import
U64
from
ZODB.utils
import
U64
from
ZODB.fsdump
import
get_pickle_metadata
from
ZODB.fsdump
import
get_pickle_metadata
...
...
src/zLOG/EventLogger.py
View file @
a5347703
...
@@ -19,7 +19,7 @@ This uses Vinay Sajip's PEP 282 logging module.
...
@@ -19,7 +19,7 @@ This uses Vinay Sajip's PEP 282 logging module.
__version__
=
'$Revision$'
[
11
:
-
2
]
__version__
=
'$Revision$'
[
11
:
-
2
]
import
os
,
sys
,
time
import
os
,
time
import
logging
import
logging
from
BaseLogger
import
BaseLogger
from
BaseLogger
import
BaseLogger
from
ZConfig.components.logger
import
loghandler
from
ZConfig.components.logger
import
loghandler
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment