unused import fixes

inary/actionsapi/inarytools.py

@@ -24,10 +24,9 @@ import sys
 # Inary Modules
 from inary.util.files import uncompress
 from inary.util.strings import remove_prefix
-from inary.errors import FileError, Error
+from inary.errors import FileError
 
 # ActionsAPI Modules
-import inary.actionsapi
 from inary.actionsapi import error
 from inary.actionsapi.shelltools import *
 import inary.actionsapi.get as get

inary/actionsapi/shelltools.py

@@ -15,7 +15,6 @@
 import inary.context as ctx
 from inary.util import colorize
 from inary.util import join_path
-from inary.util import run_logged
 
 # ActionsAPI Modules
 from inary.actionsapi import error

inary/atomicoperations.py

@@ -23,7 +23,7 @@ import inary
 import inary.configfile
 import inary.context as ctx
 import inary.data
-from inary.errors import PostOpsError, NotfoundError, Error, FileError
+from inary.errors import Error, FileError
 import inary.data
 import inary.db
 import inary.file

inary/cli/mirror.py

@@ -13,7 +13,10 @@
 import inary.db
 import inary.context as ctx
 import inary.cli.command as command
+<<<<<<< HEAD
+=======
 import inary.data.index as index
+>>>>>>> b3d4edf3096eff70f802ab6c925dc5228fa38e15
 import optparse
 import os
 

inary/data/pgraph.py

@@ -16,7 +16,6 @@
 
 # Inary Modules
 import inary.db
-from inary.errors import CycleException
 import inary.context as ctx
 import inary.operations.helper as op_helper
 

inary/operations/build.py

@@ -32,7 +32,6 @@ import inary.fetcher
 import inary.package
 import inary.util as util
 import inary.context as ctx
-import inary.process as process
 import inary.data.files as Files
 import inary.data.metadata as Metadata
 import inary.data.specfile as Specfile

inary/operations/emerge.py

@@ -12,9 +12,6 @@
 # Please read the COPYING file.
 #
 
-# Standart Python Libraries
-import sys
-
 # Inary Modules
 import inary.db
 import inary.data
@@ -23,7 +20,7 @@ import inary.util as util
 import inary.context as ctx
 import inary.data.pgraph as pgraph
 import inary.operations as operations
-import inary.atomicoperations as atomicoperations
+#import inary.atomicoperations as atomicoperations
 
 # Gettext Library
 import gettext
@@ -81,6 +78,10 @@ installed in the respective order to satisfy dependencies:
     inary.operations.emerge.emerge(sourcedb.get_source_names(order_inst))
 
     # Dependency install from binary repo (half emerge)
+<<<<<<< HEAD
+    # TODO: Add half-emerge support from parameter
+=======
+>>>>>>> b3d4edf3096eff70f802ab6c925dc5228fa38e15
     # for x in order_inst:
     #    atomicoperations.install_single_name(x)
 

inary/operations/install.py

@@ -14,7 +14,6 @@
 
 # Standart Python Libraries
 import os
-import sys
 import math
 import zipfile
 

inary/operations/remove.py

@@ -14,7 +14,6 @@
 
 # Standart Python Libraries
 import os
-import sys
 
 # Inary Modules
 import inary.db

inary/operations/upgrade.py

@@ -14,7 +14,6 @@
 
 # Standart Python Libraries
 import os
-import sys
 import math
 
 # Inary Modules

inary/util/curses.py

@@ -16,8 +16,6 @@
 
 # Inary Modules
 import sys
-import inary
-import inary.errors
 import inary.context as ctx
 
 # Gettext Library