SF.net SVN: fclient:[692] trunk/fclient/src/fclient/lib/fcp2

[<jU...@us...>]

Revision: 692
          http://fclient.svn.sourceforge.net/fclient/?rev=692&view=rev
Author:   jUrner
Date:     2008-07-20 10:39:36 +0000 (Sun, 20 Jul 2008)

Log Message:
-----------
filenameCollision consts no longer needed

Modified Paths:
--------------
    trunk/fclient/src/fclient/lib/fcp2/__init__.py
    trunk/fclient/src/fclient/lib/fcp2/consts.py

Modified: trunk/fclient/src/fclient/lib/fcp2/__init__.py
===================================================================
--- trunk/fclient/src/fclient/lib/fcp2/__init__.py	2008-07-20 10:38:14 UTC (rev 691)
+++ trunk/fclient/src/fclient/lib/fcp2/__init__.py	2008-07-20 10:39:36 UTC (rev 692)
@@ -17,7 +17,7 @@
 from .client import Client
 from .config import (Config, ConfigDataType, ConfigItem, ConfigKeySep, ConfigValueClass)
 from .consts import (ConstByteAmountPostfix, ConstConnectReason, ConstDebugVerbosity, ConstDisconnectReason, 
-									ConstFetchError, ConstFilenameCollision, ConstInsertError, ConstKeyType, ConstLogMessages, 
+									ConstFetchError, ConstInsertError, ConstKeyType, ConstLogMessages, 
 									ConstLogger, ConstMessage, ConstPeerNodeStatus, ConstPeerNoteType, ConstPersistence, 
 									ConstPriority, ConstProtocolError, ConstPutDirType, ConstRequestModified, ConstRequestStatus, 
 									ConstRequestType, ConstReturnType, ConstTimeDeltaPostfix, ConstUploadFrom, ConstVerbosity, 

Modified: trunk/fclient/src/fclient/lib/fcp2/consts.py
===================================================================
--- trunk/fclient/src/fclient/lib/fcp2/consts.py	2008-07-20 10:38:14 UTC (rev 691)
+++ trunk/fclient/src/fclient/lib/fcp2/consts.py	2008-07-20 10:39:36 UTC (rev 692)
@@ -175,19 +175,6 @@
 	PermanentRedirect = 27		# 'USK@.../-1/' for example will always fail and return a key pointing to the current edition
 	NotAllDataFound = 28
 
-class ConstFilenameCollision(_BaseBitFlags):
-	"""Filename collision flags
-	@cvar HandleNever: don't handle filename collisions
-	@cvar HandleRename: rename file on collisions
-	@cvar MaskHandle: bitmask indicating if collisions are hadled or not
-	@cvar CollisonHandled: if this bit is set, a collision has actually been handled
-	"""
-	HandleNever = 0x0
-	HandleRename = 0x1
-	
-	MaskHandle = HandleRename
-	
-	CollisionHandled = 0x10000000		# a filename collision has already been handled
 
 class ConstInsertError(Exception):
 	"""All insert errors supported by the client"""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.