From a6fe517f87bed88da472d9a5b24ae47dfda6d40e Mon Sep 17 00:00:00 2001
From: Bas Stottelaar <basstottelaar@gmail.com>
Date: Tue, 16 Sep 2014 22:06:41 +0200
Subject: [PATCH] Removed import lib.*/from lib.*

---
 headphones/notifiers.py                       |  2 +-
 headphones/sab.py                             | 12 ++++++------
 headphones/searcher.py                        | 10 +++++-----
 headphones/searcher_rutracker.py              | 16 +++++++++-------
 lib/__init__.py                               |  1 -
 lib/apscheduler/job.py                        |  2 +-
 lib/apscheduler/jobstores/mongodb_store.py    |  4 ++--
 lib/apscheduler/jobstores/ram_store.py        |  2 +-
 lib/apscheduler/jobstores/shelve_store.py     |  6 +++---
 lib/apscheduler/jobstores/sqlalchemy_store.py |  4 ++--
 lib/apscheduler/scheduler.py                  | 12 ++++++------
 lib/apscheduler/triggers/__init__.py          |  6 +++---
 lib/apscheduler/triggers/cron/__init__.py     |  4 ++--
 lib/apscheduler/triggers/cron/expressions.py  |  2 +-
 lib/apscheduler/triggers/cron/fields.py       |  2 +-
 lib/apscheduler/triggers/interval.py          |  2 +-
 lib/apscheduler/triggers/simple.py            |  2 +-
 lib/beets/ui/commands.py                      |  2 +-
 lib/httplib2/__init__.py                      |  2 +-
 lib/oauth2/__init__.py                        |  2 +-
 lib/pygazelle/api.py                          |  2 +-
 lib/pythontwitter/__init__.py                 |  4 ++--
 22 files changed, 51 insertions(+), 50 deletions(-)
 delete mode 100755 lib/__init__.py

diff --git a/headphones/notifiers.py b/headphones/notifiers.py
index b5749e7c..5858eb40 100644
--- a/headphones/notifiers.py
+++ b/headphones/notifiers.py
@@ -18,7 +18,7 @@ from headphones import logger, helpers, common, request
 from xml.dom import minidom
 from httplib import HTTPSConnection
 from urllib import urlencode
-from lib.pynma import pynma
+from pynma import pynma
 
 import base64
 import cherrypy
diff --git a/headphones/sab.py b/headphones/sab.py
index bf746d31..30c90db9 100644
--- a/headphones/sab.py
+++ b/headphones/sab.py
@@ -17,13 +17,13 @@
 ## Stolen from Sick-Beard's sab.py ##
 #####################################
 
-import urllib, httplib
-import datetime
-
+import MultipartPostHandler
 import headphones
-
-from lib import MultipartPostHandler
-import urllib2, cookielib
+import datetime
+import cookielib
+import urllib2
+import httplib
+import urllib
 import ast
 
 from headphones.common import USER_AGENT
diff --git a/headphones/searcher.py b/headphones/searcher.py
index 72c71608..563a9bae 100644
--- a/headphones/searcher.py
+++ b/headphones/searcher.py
@@ -16,10 +16,10 @@
 # NZBGet support added by CurlyMo <curlymoo1@gmail.com> as a part of XBian - XBMC on the Raspberry Pi
 
 import urllib, urlparse
-from lib.pygazelle import api as gazelleapi
-from lib.pygazelle import encoding as gazelleencoding
-from lib.pygazelle import format as gazelleformat
-from lib.pygazelle import media as gazellemedia
+from pygazelle import api as gazelleapi
+from pygazelle import encoding as gazelleencoding
+from pygazelle import format as gazelleformat
+from pygazelle import media as gazellemedia
 from xml.dom import minidom
 from base64 import b16encode, b32decode
 from hashlib import sha1
@@ -36,7 +36,7 @@ from headphones.common import USER_AGENT
 from headphones import logger, db, helpers, classes, sab, nzbget, request
 from headphones import utorrent, transmission, notifiers
 
-from lib.bencode import bencode as bencode, bdecode
+from bencode import bencode, bdecode
 
 import headphones.searcher_rutracker as rutrackersearch
 rutracker = rutrackersearch.Rutracker()
diff --git a/headphones/searcher_rutracker.py b/headphones/searcher_rutracker.py
index d2c77c13..8be71915 100644
--- a/headphones/searcher_rutracker.py
+++ b/headphones/searcher_rutracker.py
@@ -4,19 +4,21 @@
 # Headphones rutracker.org search
 # Functions called from searcher.py
 
-import urllib
-import urllib2
-import cookielib
+from headphones import logger, db, utorrent
+
+from bencode import bencode as bencode, bdecode
 from urlparse import urlparse
 from bs4 import BeautifulSoup
-import headphones
-from headphones import logger, db, utorrent
-from lib.bencode import bencode as bencode, bdecode
-import os
 from tempfile import mkdtemp
 from hashlib import sha1
+
+import headphones
 import requests
+import cookielib
+import urllib2
+import urllib
 import re
+import os
 
 class Rutracker():
 
diff --git a/lib/__init__.py b/lib/__init__.py
deleted file mode 100755
index 8b137891..00000000
--- a/lib/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/apscheduler/job.py b/lib/apscheduler/job.py
index c863bc3b..868e7234 100644
--- a/lib/apscheduler/job.py
+++ b/lib/apscheduler/job.py
@@ -5,7 +5,7 @@ Jobs represent scheduled tasks.
 from threading import Lock
 from datetime import timedelta
 
-from lib.apscheduler.util import to_unicode, ref_to_obj, get_callable_name,\
+from apscheduler.util import to_unicode, ref_to_obj, get_callable_name,\
     obj_to_ref
 
 
diff --git a/lib/apscheduler/jobstores/mongodb_store.py b/lib/apscheduler/jobstores/mongodb_store.py
index d1093860..3f522c25 100644
--- a/lib/apscheduler/jobstores/mongodb_store.py
+++ b/lib/apscheduler/jobstores/mongodb_store.py
@@ -3,8 +3,8 @@ Stores jobs in a MongoDB database.
 """
 import logging
 
-from lib.apscheduler.jobstores.base import JobStore
-from lib.apscheduler.job import Job
+from apscheduler.jobstores.base import JobStore
+from apscheduler.job import Job
 
 try:
     import cPickle as pickle
diff --git a/lib/apscheduler/jobstores/ram_store.py b/lib/apscheduler/jobstores/ram_store.py
index ca6d5674..60458fba 100644
--- a/lib/apscheduler/jobstores/ram_store.py
+++ b/lib/apscheduler/jobstores/ram_store.py
@@ -2,7 +2,7 @@
 Stores jobs in an array in RAM. Provides no persistence support.
 """
 
-from lib.apscheduler.jobstores.base import JobStore
+from apscheduler.jobstores.base import JobStore
 
 
 class RAMJobStore(JobStore):
diff --git a/lib/apscheduler/jobstores/shelve_store.py b/lib/apscheduler/jobstores/shelve_store.py
index f29d53cb..87c95f8f 100644
--- a/lib/apscheduler/jobstores/shelve_store.py
+++ b/lib/apscheduler/jobstores/shelve_store.py
@@ -7,9 +7,9 @@ import pickle
 import random
 import logging
 
-from lib.apscheduler.jobstores.base import JobStore
-from lib.apscheduler.job import Job
-from lib.apscheduler.util import itervalues
+from apscheduler.jobstores.base import JobStore
+from apscheduler.job import Job
+from apscheduler.util import itervalues
 
 logger = logging.getLogger(__name__)
 
diff --git a/lib/apscheduler/jobstores/sqlalchemy_store.py b/lib/apscheduler/jobstores/sqlalchemy_store.py
index c0fee127..8ece7e24 100644
--- a/lib/apscheduler/jobstores/sqlalchemy_store.py
+++ b/lib/apscheduler/jobstores/sqlalchemy_store.py
@@ -4,8 +4,8 @@ Stores jobs in a database table using SQLAlchemy.
 import pickle
 import logging
 
-from lib.apscheduler.jobstores.base import JobStore
-from lib.apscheduler.job import Job
+from apscheduler.jobstores.base import JobStore
+from apscheduler.job import Job
 
 try:
     from sqlalchemy import *
diff --git a/lib/apscheduler/scheduler.py b/lib/apscheduler/scheduler.py
index 461cfea4..ee08ad8b 100644
--- a/lib/apscheduler/scheduler.py
+++ b/lib/apscheduler/scheduler.py
@@ -9,12 +9,12 @@ from logging import getLogger
 import os
 import sys
 
-from lib.apscheduler.util import *
-from lib.apscheduler.triggers import SimpleTrigger, IntervalTrigger, CronTrigger
-from lib.apscheduler.jobstores.ram_store import RAMJobStore
-from lib.apscheduler.job import Job, MaxInstancesReachedError
-from lib.apscheduler.events import *
-from lib.apscheduler.threadpool import ThreadPool
+from apscheduler.util import *
+from apscheduler.triggers import SimpleTrigger, IntervalTrigger, CronTrigger
+from apscheduler.jobstores.ram_store import RAMJobStore
+from apscheduler.job import Job, MaxInstancesReachedError
+from apscheduler.events import *
+from apscheduler.threadpool import ThreadPool
 
 logger = getLogger(__name__)
 
diff --git a/lib/apscheduler/triggers/__init__.py b/lib/apscheduler/triggers/__init__.py
index a40ece20..74a97884 100644
--- a/lib/apscheduler/triggers/__init__.py
+++ b/lib/apscheduler/triggers/__init__.py
@@ -1,3 +1,3 @@
-from lib.apscheduler.triggers.cron import CronTrigger
-from lib.apscheduler.triggers.interval import IntervalTrigger
-from lib.apscheduler.triggers.simple import SimpleTrigger
+from apscheduler.triggers.cron import CronTrigger
+from apscheduler.triggers.interval import IntervalTrigger
+from apscheduler.triggers.simple import SimpleTrigger
diff --git a/lib/apscheduler/triggers/cron/__init__.py b/lib/apscheduler/triggers/cron/__init__.py
index 665d2dae..3f8d9a8f 100644
--- a/lib/apscheduler/triggers/cron/__init__.py
+++ b/lib/apscheduler/triggers/cron/__init__.py
@@ -1,7 +1,7 @@
 from datetime import date, datetime
 
-from lib.apscheduler.triggers.cron.fields import *
-from lib.apscheduler.util import datetime_ceil, convert_to_datetime
+from apscheduler.triggers.cron.fields import *
+from apscheduler.util import datetime_ceil, convert_to_datetime
 
 
 class CronTrigger(object):
diff --git a/lib/apscheduler/triggers/cron/expressions.py b/lib/apscheduler/triggers/cron/expressions.py
index 646d6f3c..018c7a30 100644
--- a/lib/apscheduler/triggers/cron/expressions.py
+++ b/lib/apscheduler/triggers/cron/expressions.py
@@ -5,7 +5,7 @@ This module contains the expressions applicable for CronTrigger's fields.
 from calendar import monthrange
 import re
 
-from lib.apscheduler.util import asint
+from apscheduler.util import asint
 
 __all__ = ('AllExpression', 'RangeExpression', 'WeekdayRangeExpression',
            'WeekdayPositionExpression')
diff --git a/lib/apscheduler/triggers/cron/fields.py b/lib/apscheduler/triggers/cron/fields.py
index 24cb1b31..ef970cc9 100644
--- a/lib/apscheduler/triggers/cron/fields.py
+++ b/lib/apscheduler/triggers/cron/fields.py
@@ -5,7 +5,7 @@ fields.
 
 from calendar import monthrange
 
-from lib.apscheduler.triggers.cron.expressions import *
+from apscheduler.triggers.cron.expressions import *
 
 __all__ = ('MIN_VALUES', 'MAX_VALUES', 'DEFAULT_VALUES', 'BaseField',
            'WeekField', 'DayOfMonthField', 'DayOfWeekField')
diff --git a/lib/apscheduler/triggers/interval.py b/lib/apscheduler/triggers/interval.py
index a7c1ee11..dd16d777 100644
--- a/lib/apscheduler/triggers/interval.py
+++ b/lib/apscheduler/triggers/interval.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
 from math import ceil
 
-from lib.apscheduler.util import convert_to_datetime, timedelta_seconds
+from apscheduler.util import convert_to_datetime, timedelta_seconds
 
 
 class IntervalTrigger(object):
diff --git a/lib/apscheduler/triggers/simple.py b/lib/apscheduler/triggers/simple.py
index 702ed78b..ea61b3f1 100644
--- a/lib/apscheduler/triggers/simple.py
+++ b/lib/apscheduler/triggers/simple.py
@@ -1,4 +1,4 @@
-from lib.apscheduler.util import convert_to_datetime
+from apscheduler.util import convert_to_datetime
 
 
 class SimpleTrigger(object):
diff --git a/lib/beets/ui/commands.py b/lib/beets/ui/commands.py
index e7e631a4..3d724f60 100644
--- a/lib/beets/ui/commands.py
+++ b/lib/beets/ui/commands.py
@@ -984,7 +984,7 @@ default_commands.append(update_cmd)
 # remove: Remove items from library, delete files.
 
 def remove_items(lib, query, album, delete):
-    """Remove items matching query from lib. If album, then match and
+    """Remove items matching query from  If album, then match and
     remove whole albums. If delete, also remove files from disk.
     """
     # Get the matching items.
diff --git a/lib/httplib2/__init__.py b/lib/httplib2/__init__.py
index 58b0de02..441dfdc8 100755
--- a/lib/httplib2/__init__.py
+++ b/lib/httplib2/__init__.py
@@ -56,7 +56,7 @@ import socket
 
 # Try using local version, followed by system, and none if neither are found
 try:
-    import lib.socks as socks
+    import socks as socks
 except ImportError:
     try:
         import socks as socks
diff --git a/lib/oauth2/__init__.py b/lib/oauth2/__init__.py
index cf77705d..0ea3803e 100644
--- a/lib/oauth2/__init__.py
+++ b/lib/oauth2/__init__.py
@@ -28,7 +28,7 @@ import random
 import urlparse
 import hmac
 import binascii
-import lib.httplib2 as httplib2
+import httplib2 as httplib2
 
 try:
     from urlparse import parse_qs, parse_qsl
diff --git a/lib/pygazelle/api.py b/lib/pygazelle/api.py
index 91df1ad2..b3dba2bb 100644
--- a/lib/pygazelle/api.py
+++ b/lib/pygazelle/api.py
@@ -10,7 +10,7 @@ from HTMLParser import HTMLParser
 import sys
 import json
 import time
-import lib.requests as requests
+import requests as requests
 
 from .user import User
 from .artist import Artist
diff --git a/lib/pythontwitter/__init__.py b/lib/pythontwitter/__init__.py
index dedfe227..b13b46d9 100644
--- a/lib/pythontwitter/__init__.py
+++ b/lib/pythontwitter/__init__.py
@@ -44,7 +44,7 @@ try:
 except ImportError:
   try:
     # Python < 2.6
-    import lib.simplejson as simplejson
+    import simplejson as simplejson
   except ImportError:
     try:
       # Google App Engine
@@ -63,7 +63,7 @@ try:
 except ImportError:
   from md5 import md5
 
-import lib.oauth2 as oauth
+import oauth2 as oauth
 
 
 CHARACTER_LIMIT = 140