From a0e5c8fba484af23f0d01e406b5a3541ce647a6c Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Sun, 6 Jul 2008 15:00:06 +0200
Subject: [PATCH] move and rename some

---
 oxlib/__init__.py            | 5 +++--
 oxlib/cache.py               | 2 +-
 oxlib/{hashes.py => file.py} | 2 +-
 oxlib/html.py                | 2 +-
 oxlib/{lang.py => iso.py}    | 4 ++--
 oxlib/net.py                 | 1 +
 oxlib/normalize.py           | 4 ++--
 oxlib/text.py                | 2 +-
 oxlib/torrent.py             | 2 +-
 9 files changed, 13 insertions(+), 11 deletions(-)
 rename oxlib/{hashes.py => file.py} (90%)
 rename oxlib/{lang.py => iso.py} (99%)

diff --git a/oxlib/__init__.py b/oxlib/__init__.py
index 240a5c1..7fb11f5 100644
--- a/oxlib/__init__.py
+++ b/oxlib/__init__.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-# 2008
+# GPL 2008
 
-from hashes import *
+from file import *
 from html import *
 from text import *
 from format import *
 import net
 import cache
+from iso import *
 
 #only works if BitTornado is installed
 try:
diff --git a/oxlib/cache.py b/oxlib/cache.py
index 7c65505..0b7277f 100644
--- a/oxlib/cache.py
+++ b/oxlib/cache.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-# 2008
+# GPL 2008
 import gzip
 import StringIO
 import os
diff --git a/oxlib/hashes.py b/oxlib/file.py
similarity index 90%
rename from oxlib/hashes.py
rename to oxlib/file.py
index 4d03684..940b2b7 100644
--- a/oxlib/hashes.py
+++ b/oxlib/file.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-# GPL written 2008 by j@pad.ma
+# GPL 2008
 import sha
 import os
 
diff --git a/oxlib/html.py b/oxlib/html.py
index afceafb..fb36574 100644
--- a/oxlib/html.py
+++ b/oxlib/html.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-# GPL written 2008 by j@pad.ma
+# GPL 2008
 import re
 import string
 from htmlentitydefs import name2codepoint
diff --git a/oxlib/lang.py b/oxlib/iso.py
similarity index 99%
rename from oxlib/lang.py
rename to oxlib/iso.py
index 789cab3..ab6475b 100644
--- a/oxlib/lang.py
+++ b/oxlib/iso.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-
+# GPL 2008
 
 _iso639_languages = [
     ("Unknown", "", "", "und"),
@@ -227,7 +227,7 @@ def langCode2To3(code):
 def langCode3To2(code):
     langTo2Code(codeToLang(code))
 
-def englishName(lang):
+def langEnglishName(lang):
     lang = lang.lower()
     for l in _iso639_languages:
         if l[1].lower() == lang:
diff --git a/oxlib/net.py b/oxlib/net.py
index f07b8d0..ebeb515 100644
--- a/oxlib/net.py
+++ b/oxlib/net.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
+# GPL 2008
 import gzip
 import StringIO
 import urllib
diff --git a/oxlib/normalize.py b/oxlib/normalize.py
index 4df4405..a990c56 100644
--- a/oxlib/normalize.py
+++ b/oxlib/normalize.py
@@ -1,6 +1,6 @@
-# -*- Mode: Python; -*-
 # -*- coding: utf-8 -*-
-# vi:si:et:sw=4:sts=4:ts=4
+# vi:si:et:sw=4:sts=4:ts=4
+# GPL 2008
 import re
 
 _articles = ('the', 'la', 'a', 'die', 'der', 'le', 'el',
diff --git a/oxlib/text.py b/oxlib/text.py
index a3c746b..7453d80 100644
--- a/oxlib/text.py
+++ b/oxlib/text.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-# GPL written 2008 by j@pad.ma
+# GPL 2008
 import re
 
 
diff --git a/oxlib/torrent.py b/oxlib/torrent.py
index 6f53d5b..5b30749 100644
--- a/oxlib/torrent.py
+++ b/oxlib/torrent.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # vi:si:et:sw=4:sts=4:ts=4
-# Written 2007 by j@mailb.org
+# GPL 2007
 
 from threading import Event
 import sha