move and rename some

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:

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

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
 

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

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:

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

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',

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
 
 

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