Code refactoring (moving import ctypes to be used only when needed)

stamparm · stamparm · commit c1592e8508dc · 2013-06-04T22:23:44.000+02:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -9,7 +9,6 @@
 import contextlib
 import cookielib
 import copy
-import ctypes
 import httplib
 import inspect
 import logging
@@ -2209,6 +2208,8 @@ def runningAsAdmin():
 
         isAdmin = isinstance(_, (int, float, long)) and _ == 0
     elif IS_WIN:
+        import ctypes
+
         _ = ctypes.windll.shell32.IsUserAnAdmin()
 
         isAdmin = isinstance(_, (int, float, long)) and _ == 1
diff --git a/thirdparty/ansistrm/ansistrm.py b/thirdparty/ansistrm/ansistrm.py
@@ -1,7 +1,6 @@
 #
 # Copyright (C) 2010-2012 Vinay Sajip. All rights reserved. Licensed under the new BSD license.
 #
-import ctypes
 import logging
 import os
 import re
@@ -84,6 +83,8 @@ def output_colorized(self, message):
         }
 
         def output_colorized(self, message):
+            import ctypes
+
             parts = self.ansi_esc.split(message)
             write = self.stream.write
             h = None
diff --git a/thirdparty/magic/magic.py b/thirdparty/magic/magic.py
@@ -16,10 +16,6 @@
 
 import sys
 import os.path
-import ctypes
-import ctypes.util
-
-from ctypes import c_char_p, c_int, c_size_t, c_void_p
 
 class MagicException(Exception):
     pass
@@ -104,6 +100,12 @@ def from_buffer(buffer, mime=False):
 
 try:
     libmagic = None
+
+    import ctypes
+    import ctypes.util
+
+    from ctypes import c_char_p, c_int, c_size_t, c_void_p
+
     # Let's try to find magic or magic1
     dll = ctypes.util.find_library('magic') or ctypes.util.find_library('magic1')
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`#`
`2`	`2`	`# Copyright (C) 2010-2012 Vinay Sajip. All rights reserved. Licensed under the new BSD license.`
`3`	`3`	`#`
`4`		`-import ctypes`
`5`	`4`	`import logging`
`6`	`5`	`import os`
`7`	`6`	`import re`
`@@ -84,6 +83,8 @@ def output_colorized(self, message):`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`def output_colorized(self, message):`
	`86`	`+ import ctypes`
	`87`	`+`
`87`	`88`	`parts = self.ansi_esc.split(message)`
`88`	`89`	`write = self.stream.write`
`89`	`90`	`h = None`