[Checkins] SVN: Sandbox/nadako/z3c.mimetype/src/z3c/mimetype/utility.py Wow, how in the world did I get tabs instead of spaces in this file? :-)

Dan Korostelev nadako at gmail.com
Wed Feb 18 10:20:35 EST 2009


Log message for revision 96702:
  Wow, how in the world did I get tabs instead of spaces in this file? :-)

Changed:
  U   Sandbox/nadako/z3c.mimetype/src/z3c/mimetype/utility.py

-=-
Modified: Sandbox/nadako/z3c.mimetype/src/z3c/mimetype/utility.py
===================================================================
--- Sandbox/nadako/z3c.mimetype/src/z3c/mimetype/utility.py	2009-02-18 13:55:37 UTC (rev 96701)
+++ Sandbox/nadako/z3c.mimetype/src/z3c/mimetype/utility.py	2009-02-18 15:20:34 UTC (rev 96702)
@@ -25,106 +25,106 @@
 findBinary = re.compile('[\0-\7]').search
 
 class MIMETypesUtility(object):
-	
-	implements(IMIMETypesUtility)
+    
+    implements(IMIMETypesUtility)
 
-	_extensions = None
-	_literals = None
-	_globs = None
-	_magicDB = None
+    _extensions = None
+    _literals = None
+    _globs = None
+    _magicDB = None
 
-	def __init__(self):
-		self._extensions = {}
-		self._literals = {}
-		self._globs = []
-		self._magicDB = MagicDB()
+    def __init__(self):
+        self._extensions = {}
+        self._literals = {}
+        self._globs = []
+        self._magicDB = MagicDB()
 
-		for path in iterDataPaths(os.path.join('mime', 'globs')):
-			self._importGlobFile(path)
-		self._globs.sort(key=lambda ob:len(ob[0]), reverse=True)
-		
-		for path in iterDataPaths(os.path.join('mime', 'magic')):
-			self._magicDB.mergeFile(path)
+        for path in iterDataPaths(os.path.join('mime', 'globs')):
+            self._importGlobFile(path)
+        self._globs.sort(key=lambda ob:len(ob[0]), reverse=True)
+        
+        for path in iterDataPaths(os.path.join('mime', 'magic')):
+            self._magicDB.mergeFile(path)
 
-	def _importGlobFile(self, path):
-		for line in open(path, 'r'):
-			if line.startswith('#'):
-				continue
-			line = line[:-1]
-	
-			type_name, pattern = line.split(':', 1)
-			mtype = lookup(type_name)
-	
-			if pattern.startswith('*.'):
-				rest = pattern[2:]
-				if not ('*' in rest or '[' in rest or '?' in rest):
-					self._extensions[rest] = mtype
-					continue
-	
-			if '*' in pattern or '[' in pattern or '?' in pattern:
-				self._globs.append((pattern, mtype))
-			else:
-				self._literals[pattern] = mtype
+    def _importGlobFile(self, path):
+        for line in open(path, 'r'):
+            if line.startswith('#'):
+                continue
+            line = line[:-1]
+    
+            type_name, pattern = line.split(':', 1)
+            mtype = lookup(type_name)
+    
+            if pattern.startswith('*.'):
+                rest = pattern[2:]
+                if not ('*' in rest or '[' in rest or '?' in rest):
+                    self._extensions[rest] = mtype
+                    continue
+    
+            if '*' in pattern or '[' in pattern or '?' in pattern:
+                self._globs.append((pattern, mtype))
+            else:
+                self._literals[pattern] = mtype
 
-	def getTypeByFileName(self, filename):
-		if filename in self._literals:
-			return self._literals[filename]
-	
-		lfilename = filename.lower()
-		if lfilename in self._literals:
-			return self._literals[lfilename]
-	
-		ext = filename
-		while True:
-			p = ext.find('.')
-			if p < 0:
-				break
-			ext = ext[p + 1:]
-			if ext in self._extensions:
-				return self._extensions[ext]
-	
-		ext = lfilename
-		while True:
-			p = ext.find('.')
-			if p < 0:
-				break
-			ext = ext[p + 1:]
-			if ext in self._extensions:
-				return self._extensions[ext]
-	
-		for (glob, mime_type) in self._globs:
-			if fnmatch.fnmatch(filename, glob):
-				return mime_type
-			if fnmatch.fnmatch(lfilename, glob):
-				return mime_type
-	
-		return None
+    def getTypeByFileName(self, filename):
+        if filename in self._literals:
+            return self._literals[filename]
+    
+        lfilename = filename.lower()
+        if lfilename in self._literals:
+            return self._literals[lfilename]
+    
+        ext = filename
+        while True:
+            p = ext.find('.')
+            if p < 0:
+                break
+            ext = ext[p + 1:]
+            if ext in self._extensions:
+                return self._extensions[ext]
+    
+        ext = lfilename
+        while True:
+            p = ext.find('.')
+            if p < 0:
+                break
+            ext = ext[p + 1:]
+            if ext in self._extensions:
+                return self._extensions[ext]
+    
+        for (glob, mime_type) in self._globs:
+            if fnmatch.fnmatch(filename, glob):
+                return mime_type
+            if fnmatch.fnmatch(lfilename, glob):
+                return mime_type
+    
+        return None
 
-	def getTypeByContents(self, file, min_priority=0, max_priority=100):
-		return self._magicDB.match(file, min_priority, max_priority)
+    def getTypeByContents(self, file, min_priority=0, max_priority=100):
+        return self._magicDB.match(file, min_priority, max_priority)
 
-	def getType(self, filename=None, file=None):
-		if (filename is None) and (file is None):
-			raise TypeError('Either filename or file should be provided or both of them')
-		
-		type = None
-		
-		if file:
-			type = self.getTypeByContents(file, min_priority=80)
+    def getType(self, filename=None, file=None):
+        if (filename is None) and (file is None):
+            raise TypeError('Either filename or file should be provided or both of them')
+        
+        type = None
+        
+        if file:
+            type = self.getTypeByContents(file, min_priority=80)
 
-		if not type and filename:
-			type = self.getTypeByFileName(filename)
+        if not type and filename:
+            type = self.getTypeByFileName(filename)
 
-		if not type and file:
-			type = self.getTypeByContents(file, max_priority=80)
-		
-		if not type:
-			type = lookup('application', 'octet-stream')
-			if file:
-				file.seek(0, 0)
-				if not findBinary(file.read(32)):
-					type = lookup('text', 'plain')
+        if not type and file:
+            type = self.getTypeByContents(file, max_priority=80)
+        
+        if not type:
+            type = lookup('application', 'octet-stream')
+            if file:
+                file.seek(0, 0)
+                if not findBinary(file.read(32)):
+                    type = lookup('text', 'plain')
 
-		return type
+        return type
 
 globalMIMETypesUtility = MIMETypesUtility()



More information about the Checkins mailing list