From 6a16a0af30edb30118484b79ec518d13b4c66234 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 3 Jul 2008 11:21:18 +0200 Subject: [PATCH] rename ox -> oxweb --- README | 4 ++-- {ox => oxweb}/__init__.py | 0 {ox => oxweb}/criterion.py | 3 ++- {ox => oxweb}/dailymotion.py | 0 {ox => oxweb}/google.py | 0 {ox => oxweb}/imdb.py | 0 {ox => oxweb}/impawards.py | 3 ++- {ox => oxweb}/itunes.py | 0 {ox => oxweb}/lyricsfly.py | 0 {ox => oxweb}/mininova.py | 0 {ox => oxweb}/opensubtitles.py | 0 {ox => oxweb}/spiegel.py | 0 {ox => oxweb}/thepiratebay.py | 0 {ox => oxweb}/torrent.py | 0 {ox => oxweb}/wikipedia.py | 0 {ox => oxweb}/youtube.py | 0 setup.py | 2 +- 17 files changed, 7 insertions(+), 5 deletions(-) rename {ox => oxweb}/__init__.py (100%) rename {ox => oxweb}/criterion.py (99%) rename {ox => oxweb}/dailymotion.py (100%) rename {ox => oxweb}/google.py (100%) rename {ox => oxweb}/imdb.py (100%) rename {ox => oxweb}/impawards.py (99%) rename {ox => oxweb}/itunes.py (100%) rename {ox => oxweb}/lyricsfly.py (100%) rename {ox => oxweb}/mininova.py (100%) rename {ox => oxweb}/opensubtitles.py (100%) rename {ox => oxweb}/spiegel.py (100%) rename {ox => oxweb}/thepiratebay.py (100%) rename {ox => oxweb}/torrent.py (100%) rename {ox => oxweb}/wikipedia.py (100%) rename {ox => oxweb}/youtube.py (100%) diff --git a/README b/README index 74076a9..08edf66 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -python-ox the internet is a dict +python-oxweb the internet is a dict Depends: python2.5 @@ -8,4 +8,4 @@ Depends: Test: - nosetests --with-doctest ox + nosetests --with-doctest oxweb diff --git a/ox/__init__.py b/oxweb/__init__.py similarity index 100% rename from ox/__init__.py rename to oxweb/__init__.py diff --git a/ox/criterion.py b/oxweb/criterion.py similarity index 99% rename from ox/criterion.py rename to oxweb/criterion.py index f2cf34a..d91d637 100644 --- a/ox/criterion.py +++ b/oxweb/criterion.py @@ -2,11 +2,12 @@ # vi:si:et:sw=4:sts=4:ts=4 import re -import ox.imdb as imdb from oxutils.cache import getUrlUnicode from oxutils.html import stripTags from oxutils.text import findRe, removeSpecialCharacters +import imdb + def getData(criterionId): ''' diff --git a/ox/dailymotion.py b/oxweb/dailymotion.py similarity index 100% rename from ox/dailymotion.py rename to oxweb/dailymotion.py diff --git a/ox/google.py b/oxweb/google.py similarity index 100% rename from ox/google.py rename to oxweb/google.py diff --git a/ox/imdb.py b/oxweb/imdb.py similarity index 100% rename from ox/imdb.py rename to oxweb/imdb.py diff --git a/ox/impawards.py b/oxweb/impawards.py similarity index 99% rename from ox/impawards.py rename to oxweb/impawards.py index 8d2f79d..32eb346 100644 --- a/ox/impawards.py +++ b/oxweb/impawards.py @@ -2,11 +2,12 @@ # encoding: utf-8 import re -import ox.imdb as imdb from oxutils.cache import getUrlUnicode from oxutils.html import stripTags from oxutils.text import findRe +import imdb + def getMovieData(title = '', director = '', imdbId = ''): data = {'posterUrls': []} diff --git a/ox/itunes.py b/oxweb/itunes.py similarity index 100% rename from ox/itunes.py rename to oxweb/itunes.py diff --git a/ox/lyricsfly.py b/oxweb/lyricsfly.py similarity index 100% rename from ox/lyricsfly.py rename to oxweb/lyricsfly.py diff --git a/ox/mininova.py b/oxweb/mininova.py similarity index 100% rename from ox/mininova.py rename to oxweb/mininova.py diff --git a/ox/opensubtitles.py b/oxweb/opensubtitles.py similarity index 100% rename from ox/opensubtitles.py rename to oxweb/opensubtitles.py diff --git a/ox/spiegel.py b/oxweb/spiegel.py similarity index 100% rename from ox/spiegel.py rename to oxweb/spiegel.py diff --git a/ox/thepiratebay.py b/oxweb/thepiratebay.py similarity index 100% rename from ox/thepiratebay.py rename to oxweb/thepiratebay.py diff --git a/ox/torrent.py b/oxweb/torrent.py similarity index 100% rename from ox/torrent.py rename to oxweb/torrent.py diff --git a/ox/wikipedia.py b/oxweb/wikipedia.py similarity index 100% rename from ox/wikipedia.py rename to oxweb/wikipedia.py diff --git a/ox/youtube.py b/oxweb/youtube.py similarity index 100% rename from ox/youtube.py rename to oxweb/youtube.py diff --git a/setup.py b/setup.py index e8a5096..5275875 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import setup, find_packages import os setup( - name="ox", + name="oxweb", version="0.1", description="collection of scrapers for various websites", author="0x",